From 172859cff7df9fd8a29a1f0a4de568f644bbda50 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 23 Apr 2013 15:19:27 +1000 Subject: - 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@ --- ChangeLog | 4 ++++ mux.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c28e00beb..0bd623b1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,10 @@ [pathnames.h] use the existing _PATH_SSH_USER_RC define to construct the other pathnames; bz#2077, ok dtucker@ (no binary change) + - 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@ 20130418 - (djm) [config.guess config.sub] Update to last versions before they switch diff --git a/mux.c b/mux.c index 1ae0e0915..9f458c4cf 100644 --- a/mux.c +++ b/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.38 2013/01/02 00:32:07 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.39 2013/04/05 00:58:51 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller * @@ -219,7 +219,8 @@ mux_master_control_cleanup_cb(int cid, void *unused) __func__, c->self, c->remote_id); c->remote_id = -1; sc->ctl_chan = -1; - if (sc->type != SSH_CHANNEL_OPEN) { + if (sc->type != SSH_CHANNEL_OPEN && + sc->type != SSH_CHANNEL_OPENING) { debug2("%s: channel %d: not open", __func__, sc->self); chan_mark_dead(sc); } else { -- cgit v1.2.3