2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ddc26a6a..828c6dee8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
  - (tim) [regress/host-expand.sh] Fix for building outside of read only
    source tree.
  - (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
  - (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 @@
-/* $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>
  * 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 %s not responding.", options.hostname);
+                logit("Timeout, server %s not responding.", host);
                 cleanup_exit(255);
         }
         packet_start(SSH2_MSG_GLOBAL_REQUEST);