From 42bc98ed1d1464b450ec8b2eee58273ce886f9e9 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 10 Dec 2018 10:21:04 +0100 Subject: socket: Set socket error to get better error messages We do not want an error for ssh_socket_close() here. Signed-off-by: Andreas Schneider --- src/socket.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/socket.c b/src/socket.c index 9823d8e1..f297bcf7 100644 --- a/src/socket.c +++ b/src/socket.c @@ -244,8 +244,11 @@ int ssh_socket_pollcallback(struct ssh_poll_handle_struct *p, if (rc < 0) { err = errno; } - s->last_errno = err; ssh_socket_close(s); + /* Overwrite ssh_socket_close() error with the real socket error */ + s->last_errno = err; + errno = err; + if (s->callbacks != NULL && s->callbacks->connected != NULL) { s->callbacks->connected(SSH_SOCKET_CONNECTED_ERROR, err, -- cgit v1.2.3