summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-06-12 23:44:10 +1000
committerDarren Tucker <dtucker@zip.com.au>2007-06-12 23:44:10 +1000
commit26047496519e9ad25fb60da24645580200ecae50 (patch)
treec81a9b30d7bc1e9b292689ddcafc243a29c7f4af
parent415bddc1bdd2d0be418ab82520512d77643c05b0 (diff)
- djm@cvs.openbsd.org 2007/06/12 11:45:27
[ssh.c] improved exit message from multiplex slave sessions; bz #1262 reported by alexandre.nunes AT gmail.com; ok dtucker@
-rw-r--r--ChangeLog6
-rw-r--r--ssh.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 890625fa..1ad2b357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,10 @@
GSSAPIDelegateCredentials=yes. This is symmetric with -k (disable GSSAPI)
and is useful for hosts with /home on Kerberised NFS; bz #1312
patch from Markus.Kuhn AT cl.cam.ac.uk; ok dtucker@ markus@
+ - djm@cvs.openbsd.org 2007/06/12 11:45:27
+ [ssh.c]
+ improved exit message from multiplex slave sessions; bz #1262
+ reported by alexandre.nunes AT gmail.com; ok dtucker@
20070611
- (djm) Bugzilla #1306: silence spurious error messages from hang-on-exit
@@ -3043,4 +3047,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4694 2007/06/12 13:43:16 dtucker Exp $
+$Id: ChangeLog,v 1.4695 2007/06/12 13:44:10 dtucker Exp $
diff --git a/ssh.c b/ssh.c
index 5155da79..9af61d3c 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.297 2007/06/12 11:15:17 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.298 2007/06/12 11:45:27 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1485,7 +1485,8 @@ control_client(const char *path)
debug2("Received exit status from master %d", exitval);
if (tty_flag && options.log_level != SYSLOG_LEVEL_QUIET)
- fprintf(stderr, "Connection to master closed.\r\n");
+ fprintf(stderr, "Shared connection to %s closed.\r\n",
+ host);
exit(exitval);
}