summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-06-20 14:43:31 +1000
committerDamien Miller <djm@mindrot.org>2011-06-20 14:43:31 +1000
commit4ac99c366cc1c2afacabc1a8df560aaee5a07b98 (patch)
tree149f49428c01329c7c2543759856b37919484ef0
parent33322127ec41b04e380123d2ed4ae1df20bf18cc (diff)
downloadopenssh-git-4ac99c366cc1c2afacabc1a8df560aaee5a07b98.tar.gz
- 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--ChangeLog4
-rw-r--r--clientloop.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 74c3f90f..a566ec0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,10 @@
[servconf.c]
factor out multi-choice option parsing into a parse_multistate label
and some support structures; ok dtucker@
+ - 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
20110603
- (dtucker) [README version.h contrib/caldera/openssh.spec
diff --git a/clientloop.c b/clientloop.c
index ed1d8a23..7b7349bd 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.234 2011/05/08 12:52:01 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.235 2011/06/17 21:57:25 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2157,8 +2157,10 @@ client_stop_mux(void)
* If we are in persist mode, signal that we should close when all
* active channels are closed.
*/
- if (options.control_persist)
+ if (options.control_persist) {
session_closed = 1;
+ setproctitle("[stopped mux]");
+ }
}
/* client specific fatal cleanup */