diff options
| author | Damien Miller <djm@mindrot.org> | 2010-01-30 07:36:33 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-01-30 07:36:33 +0100 |
| commit | 0dac03febdb52ccf0dfe19dcb1d7e895264b218a (patch) | |
| tree | 942553819cd425c54a07720d6b3a99df7cb0a3ca /mux.c | |
| parent | - djm@cvs.openbsd.org 2010/01/29 00:20:41 (diff) | |
| download | openssh-0dac03febdb52ccf0dfe19dcb1d7e895264b218a.tar.xz openssh-0dac03febdb52ccf0dfe19dcb1d7e895264b218a.zip | |
- 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)
Diffstat (limited to 'mux.c')
| -rw-r--r-- | mux.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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> * @@ -214,8 +214,10 @@ mux_master_control_cleanup_cb(int cid, void *unused) debug2("%s: channel %d: not open", __func__, sc->self); chan_mark_dead(sc); } else { - chan_read_failed(sc); - chan_write_failed(sc); + if (sc->istate == CHAN_INPUT_OPEN) + chan_read_failed(sc); + if (sc->ostate == CHAN_OUTPUT_OPEN) + chan_write_failed(sc); } } channel_cancel_cleanup(c->self); |