diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2012-09-07 16:38:53 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2012-09-07 16:38:53 +1000 |
| commit | 48bf4b0ca366d68ef9c5ce95cb0c49fb3e149a40 (patch) | |
| tree | 398e1cdc98f69f8ee6916893edfd075635e746ed /clientloop.c | |
| parent | ca0d0fd806ebce746ac0bee52995fc32b1116656 (diff) | |
- dtucker@cvs.openbsd.org 2012/09/07 06:34:21
[clientloop.c]
when muxmaster is run with -N, make it shut down gracefully when a client
sends it "-O stop" rather than hanging around (bz#1985). ok djm@
Diffstat (limited to 'clientloop.c')
| -rw-r--r-- | clientloop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clientloop.c b/clientloop.c index 3de54281..56450814 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.246 2012/09/07 01:10:21 dtucker Exp $ */ +/* $OpenBSD: clientloop.c,v 1.247 2012/09/07 06:34:21 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2244,10 +2244,10 @@ client_stop_mux(void) if (options.control_path != NULL && muxserver_sock != -1) unlink(options.control_path); /* - * If we are in persist mode, signal that we should close when all - * active channels are closed. + * If we are in persist mode, or don't have a shell, signal that we + * should close when all active channels are closed. */ - if (options.control_persist) { + if (options.control_persist || no_shell_flag) { session_closed = 1; setproctitle("[stopped mux]"); } |