summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
authordjm <djm>2008-02-10 11:27:47 +0000
committerdjm <djm>2008-02-10 11:27:47 +0000
commit4f59f45fa91f5142246e5d8f89af32b43cb3baf6 (patch)
treeaeb640cc033cfffc876d62bcfb4bd4d2cf38b9e6 /serverloop.c
parent5d1f9358f3ca980ff1b1b778b0455e322edc8420 (diff)
downloadopenssh-4f59f45fa91f5142246e5d8f89af32b43cb3baf6.tar.gz
- 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 81888d0e..124d86c6 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.146 2007/12/28 15:32:24 dtucker Exp $ */
+/* $OpenBSD: serverloop.c,v 1.147 2008/01/23 01:56:54 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1193,8 +1193,6 @@ server_init_dispatch_20(void)
dispatch_set(SSH2_MSG_CHANNEL_FAILURE, &server_input_keep_alive);
dispatch_set(SSH2_MSG_REQUEST_SUCCESS, &server_input_keep_alive);
dispatch_set(SSH2_MSG_REQUEST_FAILURE, &server_input_keep_alive);
- dispatch_set(SSH2_MSG_IGNORE, &server_input_keep_alive);
- dispatch_set(SSH2_MSG_UNIMPLEMENTED, &server_input_keep_alive);
/* rekeying */
dispatch_set(SSH2_MSG_KEXINIT, &kex_input_kexinit);
}