From 85c50d7858424aa38a560142c04c93a70d50dff7 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 10 May 2010 11:53:02 +1000 Subject: - djm@cvs.openbsd.org 2010/04/23 22:27:38 [mux.c] set "detach_close" flag when registering channel cleanup callbacks. This causes the channel to close normally when its fds close and hangs when terminating a mux slave using ~. bz#1758; ok markus@ --- mux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mux.c') diff --git a/mux.c b/mux.c index b0d4abe19..ac477a0e7 100644 --- a/mux.c +++ b/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.15 2010/04/10 05:48:16 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.16 2010/04/23 22:27:38 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller * @@ -454,7 +454,7 @@ process_mux_new_session(u_int rid, Channel *c, Buffer *m, Buffer *r) channel_send_open(nc->self); channel_register_open_confirm(nc->self, mux_session_confirm, cctx); - channel_register_cleanup(nc->self, mux_master_session_cleanup_cb, 0); + channel_register_cleanup(nc->self, mux_master_session_cleanup_cb, 1); /* prepare reply */ /* XXX defer until mux_session_confirm() fires */ @@ -826,7 +826,7 @@ process_mux_stdio_fwd(u_int rid, Channel *c, Buffer *m, Buffer *r) debug2("%s: channel_new: %d linked to control channel %d", __func__, nc->self, nc->ctl_chan); - channel_register_cleanup(nc->self, mux_master_session_cleanup_cb, 0); + channel_register_cleanup(nc->self, mux_master_session_cleanup_cb, 1); /* prepare reply */ /* XXX defer until channel confirmed */ -- cgit v1.2.3