diff options
author | Damien Miller <djm@mindrot.org> | 2011-01-11 17:18:56 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-01-11 17:18:56 +1100 |
commit | b73b6fd916a842dbcf800c13434a6abb6cd06ade (patch) | |
tree | ecb79e5c1fc8cd17515c6d739dc55f988ed203b6 | |
parent | 81ad4b1fc0f3d2004a0e0004607ebd9a3664034b (diff) |
- 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | clientloop.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -2,6 +2,11 @@ | |||
2 | - (tim) [regress/host-expand.sh] Fix for building outside of read only | 2 | - (tim) [regress/host-expand.sh] Fix for building outside of read only |
3 | source tree. | 3 | source tree. |
4 | - (djm) [platform.c] Some missing includes that show up under -Werror | 4 | - (djm) [platform.c] Some missing includes that show up under -Werror |
5 | - OpenBSD CVS Sync | ||
6 | - djm@cvs.openbsd.org 2011/01/08 10:51:51 | ||
7 | [clientloop.c] | ||
8 | use host and not options.hostname, as the latter may have unescaped | ||
9 | substitution characters | ||
5 | 10 | ||
6 | 20110109 | 11 | 20110109 |
7 | - (djm) [Makefile.in] list ssh_host_ecdsa key in PATHSUBS; spotted by | 12 | - (djm) [Makefile.in] list ssh_host_ecdsa key in PATHSUBS; spotted by |
diff --git a/clientloop.c b/clientloop.c index 184671d6c..7712f69be 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.227 2011/01/06 22:23:02 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.228 2011/01/08 10:51:51 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -544,7 +544,7 @@ static void | |||
544 | server_alive_check(void) | 544 | server_alive_check(void) |
545 | { | 545 | { |
546 | if (packet_inc_alive_timeouts() > options.server_alive_count_max) { | 546 | if (packet_inc_alive_timeouts() > options.server_alive_count_max) { |
547 | logit("Timeout, server %s not responding.", options.hostname); | 547 | logit("Timeout, server %s not responding.", host); |
548 | cleanup_exit(255); | 548 | cleanup_exit(255); |
549 | } | 549 | } |
550 | packet_start(SSH2_MSG_GLOBAL_REQUEST); | 550 | packet_start(SSH2_MSG_GLOBAL_REQUEST); |