tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2010/01/29 20:16:17 

[mux.c]
     kill correct channel (was killing already-dead mux channel, not
     its session channel)
This commit is contained in:
Damien Miller 2010-01-30 17:36:33 +11:00
parent 133d9d313e
commit 0dac03febd
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -9,6 +9,10 @@
[sshd.c] [sshd.c]
set FD_CLOEXEC on sock_in/sock_out; bz#1706 from jchadima AT redhat.com set FD_CLOEXEC on sock_in/sock_out; bz#1706 from jchadima AT redhat.com
ok dtucker@ ok dtucker@
- djm@cvs.openbsd.org 2010/01/29 20:16:17
[mux.c]
kill correct channel (was killing already-dead mux channel, not
its session channel)
20100129 20100129
- (dtucker) [openbsd-compat/openssl-compat.c] Bug #1707: Call OPENSSL_config() - (dtucker) [openbsd-compat/openssl-compat.c] Bug #1707: Call OPENSSL_config()

8
mux.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: mux.c,v 1.13 2010/01/29 20:16:17 djm Exp $ */ /* $OpenBSD: mux.c,v 1.14 2010/01/30 02:54:53 djm Exp $ */
/* /*
* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
* *
@ -214,8 +214,10 @@ mux_master_control_cleanup_cb(int cid, void *unused)
debug2("%s: channel %d: not open", __func__, sc->self); debug2("%s: channel %d: not open", __func__, sc->self);
chan_mark_dead(sc); chan_mark_dead(sc);
} else { } else {
chan_read_failed(sc); if (sc->istate == CHAN_INPUT_OPEN)
chan_write_failed(sc); chan_read_failed(sc);
if (sc->ostate == CHAN_OUTPUT_OPEN)
chan_write_failed(sc);
} }
} }
channel_cancel_cleanup(c->self); channel_cancel_cleanup(c->self);