summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-02-10 22:27:47 +1100
committerDamien Miller <djm@mindrot.org>2008-02-10 22:27:47 +1100
commit5ed3d575f90cb62979e25c611da29e08069f1006 (patch)
treef9cfbc8edcb230ce3ffd9a5f8322194d4e8a10a4 /serverloop.c
parentacdf25b31f02c010ed2b5f655bbae0f5b75f07f6 (diff)
- dtucker@cvs.openbsd.org 2008/01/23 01:56:54
[clientloop.c packet.c serverloop.c] Revert the change for bz #1307 as it causes connection aborts if an IGNORE packet arrives while we're waiting in packet_read_expect (and possibly elsewhere).
Diffstat (limited to 'serverloop.c')
-rw-r--r--serverloop.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/serverloop.c b/serverloop.c
index 81888d0e5..124d86c6e 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: serverloop.c,v 1.146 2007/12/28 15:32:24 dtucker Exp $ */ 1/* $OpenBSD: serverloop.c,v 1.147 2008/01/23 01:56:54 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1193,8 +1193,6 @@ server_init_dispatch_20(void)
1193 dispatch_set(SSH2_MSG_CHANNEL_FAILURE, &server_input_keep_alive); 1193 dispatch_set(SSH2_MSG_CHANNEL_FAILURE, &server_input_keep_alive);
1194 dispatch_set(SSH2_MSG_REQUEST_SUCCESS, &server_input_keep_alive); 1194 dispatch_set(SSH2_MSG_REQUEST_SUCCESS, &server_input_keep_alive);
1195 dispatch_set(SSH2_MSG_REQUEST_FAILURE, &server_input_keep_alive); 1195 dispatch_set(SSH2_MSG_REQUEST_FAILURE, &server_input_keep_alive);
1196 dispatch_set(SSH2_MSG_IGNORE, &server_input_keep_alive);
1197 dispatch_set(SSH2_MSG_UNIMPLEMENTED, &server_input_keep_alive);
1198 /* rekeying */ 1196 /* rekeying */
1199 dispatch_set(SSH2_MSG_KEXINIT, &kex_input_kexinit); 1197 dispatch_set(SSH2_MSG_KEXINIT, &kex_input_kexinit);
1200} 1198}