diff options
author | Damien Miller <djm@mindrot.org> | 2009-01-28 16:22:34 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2009-01-28 16:22:34 +1100 |
commit | 7a60621d13de221d3de77784ea14baf72e0233f4 (patch) | |
tree | 0f8cd289b53ba5aa9dabe724aa068a08deeeb42e | |
parent | 17819015f0debf7dc6a4e908b6e830ff105e4685 (diff) |
- djm@cvs.openbsd.org 2009/01/01 21:14:35
[channels.c]
call channel destroy callbacks on receipt of open failure messages.
fixes client hangs when connecting to a server that has MaxSessions=0
set spotted by imorgan AT nas.nasa.gov; ok markus@
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | channels.c | 6 |
2 files changed, 9 insertions, 4 deletions
@@ -31,6 +31,11 @@ | |||
31 | [sshd_config.5] | 31 | [sshd_config.5] |
32 | add AllowAgentForwarding to available Match keywords list | 32 | add AllowAgentForwarding to available Match keywords list |
33 | ok djm | 33 | ok djm |
34 | - djm@cvs.openbsd.org 2009/01/01 21:14:35 | ||
35 | [channels.c] | ||
36 | call channel destroy callbacks on receipt of open failure messages. | ||
37 | fixes client hangs when connecting to a server that has MaxSessions=0 | ||
38 | set spotted by imorgan AT nas.nasa.gov; ok markus@ | ||
34 | 39 | ||
35 | 20090107 | 40 | 20090107 |
36 | - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. | 41 | - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. |
@@ -5040,5 +5045,5 @@ | |||
5040 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 5045 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
5041 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 5046 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
5042 | 5047 | ||
5043 | $Id: ChangeLog,v 1.5168 2009/01/28 05:20:17 djm Exp $ | 5048 | $Id: ChangeLog,v 1.5169 2009/01/28 05:22:34 djm Exp $ |
5044 | 5049 | ||
diff --git a/channels.c b/channels.c index c0d335921..d138882b3 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.290 2008/12/09 03:20:42 stevesk Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.291 2009/01/01 21:14:35 djm 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 |
@@ -2311,8 +2311,8 @@ channel_input_open_failure(int type, u_int32_t seq, void *ctxt) | |||
2311 | xfree(lang); | 2311 | xfree(lang); |
2312 | } | 2312 | } |
2313 | packet_check_eom(); | 2313 | packet_check_eom(); |
2314 | /* Free the channel. This will also close the socket. */ | 2314 | /* Schedule the channel for cleanup/deletion. */ |
2315 | channel_free(c); | 2315 | chan_mark_dead(c); |
2316 | } | 2316 | } |
2317 | 2317 | ||
2318 | /* ARGSUSED */ | 2318 | /* ARGSUSED */ |