summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--clientloop.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 289dc0011..1655f764c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@
13 - dtucker@cvs.openbsd.org 2012/09/07 01:10:21 13 - dtucker@cvs.openbsd.org 2012/09/07 01:10:21
14 [clientloop.c] 14 [clientloop.c]
15 Merge escape help text for ~v and ~V; ok djm@ 15 Merge escape help text for ~v and ~V; ok djm@
16 - dtucker@cvs.openbsd.org 2012/09/07 06:34:21
17 [clientloop.c]
18 when muxmaster is run with -N, make it shut down gracefully when a client
19 sends it "-O stop" rather than hanging around (bz#1985). ok djm@
16 20
1720120906 2120120906
18 - (dtucker) OpenBSD CVS Sync 22 - (dtucker) OpenBSD CVS Sync
diff --git a/clientloop.c b/clientloop.c
index 3de542814..564508146 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.246 2012/09/07 01:10:21 dtucker Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.247 2012/09/07 06:34:21 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2244,10 +2244,10 @@ client_stop_mux(void)
2244 if (options.control_path != NULL && muxserver_sock != -1) 2244 if (options.control_path != NULL && muxserver_sock != -1)
2245 unlink(options.control_path); 2245 unlink(options.control_path);
2246 /* 2246 /*
2247 * If we are in persist mode, signal that we should close when all 2247 * If we are in persist mode, or don't have a shell, signal that we
2248 * active channels are closed. 2248 * should close when all active channels are closed.
2249 */ 2249 */
2250 if (options.control_persist) { 2250 if (options.control_persist || no_shell_flag) {
2251 session_closed = 1; 2251 session_closed = 1;
2252 setproctitle("[stopped mux]"); 2252 setproctitle("[stopped mux]");
2253 } 2253 }