summaryrefslogtreecommitdiff
path: root/mux.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-01-30 17:30:04 +1100
committerDamien Miller <djm@mindrot.org>2010-01-30 17:30:04 +1100
commit133d9d313e1058ed5d028abb450de253c00a4c5d (patch)
tree709a2e0a70aca69278bec092ea6135d5d5ccdb4f /mux.c
parent36f57ebf3b5ecf697c5ae868dbc0992792890e06 (diff)
- djm@cvs.openbsd.org 2010/01/29 00:20:41
[sshd.c] set FD_CLOEXEC on sock_in/sock_out; bz#1706 from jchadima AT redhat.com ok dtucker@
Diffstat (limited to 'mux.c')
-rw-r--r--mux.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mux.c b/mux.c
index 64781d44c..0e07883e4 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: mux.c,v 1.12 2010/01/27 13:26:17 djm Exp $ */ 1/* $OpenBSD: mux.c,v 1.13 2010/01/29 20:16:17 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 *
@@ -212,7 +212,7 @@ mux_master_control_cleanup_cb(int cid, void *unused)
212 sc->ctl_chan = -1; 212 sc->ctl_chan = -1;
213 if (sc->type != SSH_CHANNEL_OPEN) { 213 if (sc->type != SSH_CHANNEL_OPEN) {
214 debug2("%s: channel %d: not open", __func__, sc->self); 214 debug2("%s: channel %d: not open", __func__, sc->self);
215 chan_mark_dead(c); 215 chan_mark_dead(sc);
216 } else { 216 } else {
217 chan_read_failed(sc); 217 chan_read_failed(sc);
218 chan_write_failed(sc); 218 chan_write_failed(sc);