summaryrefslogtreecommitdiffstats
path: root/src/server.c
diff options
context:
space:
mode:
authorrofl0r <retnyg@gmx.net>2011-08-05 03:00:21 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-08-07 12:47:09 +0200
commit61a97ccedef470e587798fee52fb011e8d9c323a (patch)
tree180a8cb7a5976adb205474c3e9e400b2658d8b7e /src/server.c
parenta1ef27c0b882d0791ab29584f015d1f8bee44996 (diff)
downloadlibssh-61a97ccedef470e587798fee52fb011e8d9c323a.tar.gz
libssh-61a97ccedef470e587798fee52fb011e8d9c323a.tar.xz
libssh-61a97ccedef470e587798fee52fb011e8d9c323a.zip
session: Fix timeout handling.
-2 now means to use the timeout specified in options. It wasn't used earlier and poll only knows -1 and 0 anyway for special meanings. (cherry picked from commit af85337f5ff052437fa5cf117f3d065488640660)
Diffstat (limited to 'src/server.c')
-rw-r--r--src/server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server.c b/src/server.c
index 27319516..aed9e4da 100644
--- a/src/server.c
+++ b/src/server.c
@@ -479,7 +479,7 @@ int ssh_handle_key_exchange(ssh_session session) {
* loop until SSH_SESSION_STATE_BANNER_RECEIVED or
* SSH_SESSION_STATE_ERROR
*/
- ssh_handle_packets(session,-1);
+ ssh_handle_packets(session, -2);
ssh_log(session,SSH_LOG_PACKET, "ssh_handle_key_exchange: Actual state : %d",
session->session_state);
}