summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/mux.c
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2010-01-29 20:16:18 +0000
committerDamien Miller <djm@cvs.openbsd.org>2010-01-29 20:16:18 +0000
commit2ff7857928eae484e5c3a43d522bd04afce19c75 (patch)
treeb9e1c20cbcd2179501750f3b43ef24fe567f3e75 /usr.bin/ssh/mux.c
parent31e032aabd2861a8d88cb4902ba845f7b566eb10 (diff)
kill correct channel (was killing already-dead mux channel, not
its session channel)
Diffstat (limited to 'usr.bin/ssh/mux.c')
-rw-r--r--usr.bin/ssh/mux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/mux.c b/usr.bin/ssh/mux.c
index 0fa68b4d6b9..4761d348b06 100644
--- a/usr.bin/ssh/mux.c
+++ b/usr.bin/ssh/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.12 2010/01/27 13:26:17 djm Exp $ */
+/* $OpenBSD: mux.c,v 1.13 2010/01/29 20:16:17 djm Exp $ */
/*
* Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
*
@@ -195,7 +195,7 @@ mux_master_control_cleanup_cb(int cid, void *unused)
sc->ctl_chan = -1;
if (sc->type != SSH_CHANNEL_OPEN) {
debug2("%s: channel %d: not open", __func__, sc->self);
- chan_mark_dead(c);
+ chan_mark_dead(sc);
} else {
chan_read_failed(sc);
chan_write_failed(sc);