diff options
| author |   dtucker <dtucker@openbsd.org> | 2012-09-07 06:34:21 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2012-09-07 06:34:21 +0000 |
| commit | f3fe4a492eb72531f99dec24ab7e9da03e983f7f (patch) | |
| tree | 7b7f5c085ed1fd7130f4feac707cd14bec480931 | |
| parent | add pkcs5_pbkdf2(3); (diff) | |
| download | wireguard-openbsd-f3fe4a492eb72531f99dec24ab7e9da03e983f7f.tar.xz wireguard-openbsd-f3fe4a492eb72531f99dec24ab7e9da03e983f7f.zip | |
when muxmaster is run with -N, make it shut down gracefully when a client
sends it "-O stop" rather than hanging around. ok djm@
| -rw-r--r-- | usr.bin/ssh/clientloop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c index 3503746c7ef..d7ec61db7d2 100644 --- a/usr.bin/ssh/clientloop.c +++ b/usr.bin/ssh/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 @@ -2226,10 +2226,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]"); } |