diff options
author | Damien Miller <djm@mindrot.org> | 2011-06-20 14:43:31 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-06-20 14:43:31 +1000 |
commit | 4ac99c366cc1c2afacabc1a8df560aaee5a07b98 (patch) | |
tree | 149f49428c01329c7c2543759856b37919484ef0 | |
parent | 33322127ec41b04e380123d2ed4ae1df20bf18cc (diff) |
- djm@cvs.openbsd.org 2011/06/17 21:57:25
[clientloop.c]
setproctitle for a mux master that has been gracefully stopped;
bz#1911 from Bert.Wesarg AT googlemail.com
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | clientloop.c | 6 |
2 files changed, 8 insertions, 2 deletions
@@ -21,6 +21,10 @@ | |||
21 | [servconf.c] | 21 | [servconf.c] |
22 | factor out multi-choice option parsing into a parse_multistate label | 22 | factor out multi-choice option parsing into a parse_multistate label |
23 | and some support structures; ok dtucker@ | 23 | and some support structures; ok dtucker@ |
24 | - djm@cvs.openbsd.org 2011/06/17 21:57:25 | ||
25 | [clientloop.c] | ||
26 | setproctitle for a mux master that has been gracefully stopped; | ||
27 | bz#1911 from Bert.Wesarg AT googlemail.com | ||
24 | 28 | ||
25 | 20110603 | 29 | 20110603 |
26 | - (dtucker) [README version.h contrib/caldera/openssh.spec | 30 | - (dtucker) [README version.h contrib/caldera/openssh.spec |
diff --git a/clientloop.c b/clientloop.c index ed1d8a238..7b7349bd7 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.234 2011/05/08 12:52:01 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.235 2011/06/17 21:57:25 djm 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 |
@@ -2157,8 +2157,10 @@ client_stop_mux(void) | |||
2157 | * If we are in persist mode, signal that we should close when all | 2157 | * If we are in persist mode, signal that we should close when all |
2158 | * active channels are closed. | 2158 | * active channels are closed. |
2159 | */ | 2159 | */ |
2160 | if (options.control_persist) | 2160 | if (options.control_persist) { |
2161 | session_closed = 1; | 2161 | session_closed = 1; |
2162 | setproctitle("[stopped mux]"); | ||
2163 | } | ||
2162 | } | 2164 | } |
2163 | 2165 | ||
2164 | /* client specific fatal cleanup */ | 2166 | /* client specific fatal cleanup */ |