summaryrefslogtreecommitdiff
path: root/mux.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-04-23 15:19:27 +1000
committerDamien Miller <djm@mindrot.org>2013-04-23 15:19:27 +1000
commit172859cff7df9fd8a29a1f0a4de568f644bbda50 (patch)
treeb08f7c556638ebc9d23f1f05ae674e59689f15b2 /mux.c
parent9f12b5dcd5f7772e633fb2786c63bfcbea1f1aea (diff)
- djm@cvs.openbsd.org 2013/04/05 00:58:51
[mux.c] cleanup mux-created channels that are in SSH_CHANNEL_OPENING state too (in addition to ones already in OPEN); bz#2079, ok dtucker@
Diffstat (limited to 'mux.c')
-rw-r--r--mux.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mux.c b/mux.c
index 1ae0e0915..9f458c4cf 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mux.c,v 1.38 2013/01/02 00:32:07 djm Exp $ */ 1/* $OpenBSD: mux.c,v 1.39 2013/04/05 00:58:51 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
4 * 4 *
@@ -219,7 +219,8 @@ mux_master_control_cleanup_cb(int cid, void *unused)
219 __func__, c->self, c->remote_id); 219 __func__, c->self, c->remote_id);
220 c->remote_id = -1; 220 c->remote_id = -1;
221 sc->ctl_chan = -1; 221 sc->ctl_chan = -1;
222 if (sc->type != SSH_CHANNEL_OPEN) { 222 if (sc->type != SSH_CHANNEL_OPEN &&
223 sc->type != SSH_CHANNEL_OPENING) {
223 debug2("%s: channel %d: not open", __func__, sc->self); 224 debug2("%s: channel %d: not open", __func__, sc->self);
224 chan_mark_dead(sc); 225 chan_mark_dead(sc);
225 } else { 226 } else {