aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Viennot <nicolas@viennot.biz>2013-06-10 04:40:46 -0400
committerAndreas Schneider <asn@cryptomilk.org>2013-07-25 22:35:03 +0200
commitcdf193d8b5ee3d0e85d2e681a93cda43111c80d6 (patch)
tree1cb267e46e7f054eff1f7228d980bd9685fc1fa8
parent2f674aeec157038b5c98e25d7947082de8290568 (diff)
downloadlibssh-cdf193d8b5ee3d0e85d2e681a93cda43111c80d6.tar.gz
libssh-cdf193d8b5ee3d0e85d2e681a93cda43111c80d6.tar.xz
libssh-cdf193d8b5ee3d0e85d2e681a93cda43111c80d6.zip
session: ssh_handle_packets_termination() SSH_AGAIN bug fix
ssh_handle_packets_termination() must not return SSH_OK when exiting due to a timeout while the termination function still returns 1. Signed-off-by: Nicolas Viennot <nicolas@viennot.biz> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
-rw-r--r--src/session.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/session.c b/src/session.c
index c6d0ec8f..59521121 100644
--- a/src/session.c
+++ b/src/session.c
@@ -547,6 +547,7 @@ int ssh_handle_packets_termination(ssh_session session,
break;
}
if (ssh_timeout_elapsed(&ts,timeout)) {
+ ret = fct(user) ? SSH_OK : SSH_AGAIN;
break;
}