diff options
| author | Damien Miller <djm@mindrot.org> | 2011-01-07 09:51:52 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2011-01-07 09:51:52 +1100 |
| commit | 64abf31425e2e72b9d308b51519bd123ae77830f (patch) | |
| tree | 33a0b5b62dfa810bce186ecec68192a7a7a2adac | |
| parent | 83f8a4014d1818687f4e0ab36d1d388abac78863 (diff) | |
- djm@cvs.openbsd.org 2011/01/06 22:23:02
[clientloop.c]
when exiting due to ServerAliveTimeout, mention the hostname that caused
it (useful with backgrounded controlmaster)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | clientloop.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -5,6 +5,10 @@ [ssh.c] unbreak %n expansion in LocalCommand; patch from bert.wesarg AT googlemail.com; ok markus@ + - djm@cvs.openbsd.org 2011/01/06 22:23:02 + [clientloop.c] + when exiting due to ServerAliveTimeout, mention the hostname that caused + it (useful with backgrounded controlmaster) 20110106 - (djm) OpenBSD CVS Sync diff --git a/clientloop.c b/clientloop.c index 91eea856..184671d6 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.226 2010/11/23 23:57:24 djm Exp $ */ +/* $OpenBSD: clientloop.c,v 1.227 2011/01/06 22:23:02 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -544,7 +544,7 @@ static void server_alive_check(void) { if (packet_inc_alive_timeouts() > options.server_alive_count_max) { - logit("Timeout, server not responding."); + logit("Timeout, server %s not responding.", options.hostname); cleanup_exit(255); } packet_start(SSH2_MSG_GLOBAL_REQUEST); |