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

- 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)
This commit is contained in:
Damien Miller 2011-01-07 09:51:52 +11:00
parent 83f8a4014d
commit 64abf31425
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -5,6 +5,10 @@
[ssh.c] [ssh.c]
unbreak %n expansion in LocalCommand; patch from bert.wesarg AT unbreak %n expansion in LocalCommand; patch from bert.wesarg AT
googlemail.com; ok markus@ 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 20110106
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync

4
clientloop.c
View File

@ -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> * 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
@ -544,7 +544,7 @@ static void
server_alive_check(void) server_alive_check(void)
{ {
if (packet_inc_alive_timeouts() > options.server_alive_count_max) { 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); cleanup_exit(255);
} }
packet_start(SSH2_MSG_GLOBAL_REQUEST); packet_start(SSH2_MSG_GLOBAL_REQUEST);