RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2011/01/08 10:51:51 

[clientloop.c]
     use host and not options.hostname, as the latter may have unescaped
     substitution characters
This commit is contained in:
Damien Miller 2011-01-11 17:18:56 +11:00
parent 81ad4b1fc0
commit b73b6fd916
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -2,6 +2,11 @@
- (tim) [regress/host-expand.sh] Fix for building outside of read only - (tim) [regress/host-expand.sh] Fix for building outside of read only
source tree. source tree.
- (djm) [platform.c] Some missing includes that show up under -Werror - (djm) [platform.c] Some missing includes that show up under -Werror
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2011/01/08 10:51:51
[clientloop.c]
use host and not options.hostname, as the latter may have unescaped
substitution characters
20110109 20110109
- (djm) [Makefile.in] list ssh_host_ecdsa key in PATHSUBS; spotted by - (djm) [Makefile.in] list ssh_host_ecdsa key in PATHSUBS; spotted by

4
clientloop.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: clientloop.c,v 1.227 2011/01/06 22:23:02 djm Exp $ */ /* $OpenBSD: clientloop.c,v 1.228 2011/01/08 10:51:51 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 %s not responding.", options.hostname); logit("Timeout, server %s not responding.", host);
cleanup_exit(255); cleanup_exit(255);
} }
packet_start(SSH2_MSG_GLOBAL_REQUEST); packet_start(SSH2_MSG_GLOBAL_REQUEST);