diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | serverloop.c | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -9,6 +9,10 @@ | |||
9 | SSH2_MSG_CHANNEL_SUCCESS/SSH2_MSG_CHANNEL_FAILURE messages, | 9 | SSH2_MSG_CHANNEL_SUCCESS/SSH2_MSG_CHANNEL_FAILURE messages, |
10 | otherwise we trigger 'Non-public channel' error messages on sshd | 10 | otherwise we trigger 'Non-public channel' error messages on sshd |
11 | systems with clientkeepalive enabled; noticed by sturm; ok djm; | 11 | systems with clientkeepalive enabled; noticed by sturm; ok djm; |
12 | - markus@cvs.openbsd.org 2008/12/02 19:08:59 | ||
13 | [serverloop.c] | ||
14 | backout 1.149, since it's not necessary and openssh clients send | ||
15 | broken CHANNEL_FAILURE/SUCCESS messages since about 2004; ok djm@ | ||
12 | 16 | ||
13 | 20081201 | 17 | 20081201 |
14 | - (dtucker) [contrib/cygwin/{Makefile,ssh-host-config}] Add new doc files | 18 | - (dtucker) [contrib/cygwin/{Makefile,ssh-host-config}] Add new doc files |
@@ -4957,5 +4961,5 @@ | |||
4957 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4961 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4958 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4962 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4959 | 4963 | ||
4960 | $Id: ChangeLog,v 1.5149 2008/12/07 22:54:40 djm Exp $ | 4964 | $Id: ChangeLog,v 1.5150 2008/12/07 22:55:02 djm Exp $ |
4961 | 4965 | ||
diff --git a/serverloop.c b/serverloop.c index 77d9dee75..6a3ae1665 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: serverloop.c,v 1.153 2008/06/30 12:15:39 djm Exp $ */ | 1 | /* $OpenBSD: serverloop.c,v 1.154 2008/12/02 19:08:59 markus 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 |
@@ -1202,9 +1202,9 @@ server_init_dispatch_20(void) | |||
1202 | dispatch_set(SSH2_MSG_CHANNEL_REQUEST, &server_input_channel_req); | 1202 | dispatch_set(SSH2_MSG_CHANNEL_REQUEST, &server_input_channel_req); |
1203 | dispatch_set(SSH2_MSG_CHANNEL_WINDOW_ADJUST, &channel_input_window_adjust); | 1203 | dispatch_set(SSH2_MSG_CHANNEL_WINDOW_ADJUST, &channel_input_window_adjust); |
1204 | dispatch_set(SSH2_MSG_GLOBAL_REQUEST, &server_input_global_request); | 1204 | dispatch_set(SSH2_MSG_GLOBAL_REQUEST, &server_input_global_request); |
1205 | dispatch_set(SSH2_MSG_CHANNEL_SUCCESS, &channel_input_status_confirm); | ||
1206 | dispatch_set(SSH2_MSG_CHANNEL_FAILURE, &channel_input_status_confirm); | ||
1207 | /* client_alive */ | 1205 | /* client_alive */ |
1206 | dispatch_set(SSH2_MSG_CHANNEL_SUCCESS, &server_input_keep_alive); | ||
1207 | dispatch_set(SSH2_MSG_CHANNEL_FAILURE, &server_input_keep_alive); | ||
1208 | dispatch_set(SSH2_MSG_REQUEST_SUCCESS, &server_input_keep_alive); | 1208 | dispatch_set(SSH2_MSG_REQUEST_SUCCESS, &server_input_keep_alive); |
1209 | dispatch_set(SSH2_MSG_REQUEST_FAILURE, &server_input_keep_alive); | 1209 | dispatch_set(SSH2_MSG_REQUEST_FAILURE, &server_input_keep_alive); |
1210 | /* rekeying */ | 1210 | /* rekeying */ |