diff options
| author |   djm <djm@openbsd.org> | 2010-01-29 20:16:17 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2010-01-29 20:16:17 +0000 |
| commit | 237fd6c5595d7fceff546e1cc614f596e026afdc (patch) | |
| tree | 14aab4ca998e45b2d6dd8e37c91f779439d45be4 | |
| parent | Allow sorting by command and pid. Also, allow partial matches with strncmp. (diff) | |
| download | wireguard-openbsd-237fd6c5595d7fceff546e1cc614f596e026afdc.tar.xz wireguard-openbsd-237fd6c5595d7fceff546e1cc614f596e026afdc.zip | |
kill correct channel (was killing already-dead mux channel, not
its session channel)
| -rw-r--r-- | usr.bin/ssh/mux.c | 4 |
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); |