tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- 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@
This commit is contained in:
Darren Tucker 2012-09-07 16:38:53 +10:00
parent ca0d0fd806
commit 48bf4b0ca3
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -13,6 +13,10 @@
- dtucker@cvs.openbsd.org 2012/09/07 01:10:21 - dtucker@cvs.openbsd.org 2012/09/07 01:10:21
[clientloop.c] [clientloop.c]
Merge escape help text for ~v and ~V; ok djm@ Merge escape help text for ~v and ~V; ok djm@
- 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@
20120906 20120906
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync

8
clientloop.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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) if (options.control_path != NULL && muxserver_sock != -1)
unlink(options.control_path); unlink(options.control_path);
/* /*
* If we are in persist mode, signal that we should close when all * If we are in persist mode, or don't have a shell, signal that we
* active channels are closed. * should close when all active channels are closed.
*/ */
if (options.control_persist) { if (options.control_persist || no_shell_flag) {
session_closed = 1; session_closed = 1;
setproctitle("[stopped mux]"); setproctitle("[stopped mux]");
} }