New upstream release (6.9p1).

1 files changed, 4 insertions, 3 deletions

diff --git a/sshconnect.c b/sshconnect.c
index a6c9e20ed..988f4efe6 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.259 2015/01/28 22:36:00 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.262 2015/05/28 05:41:29 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -912,7 +912,7 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                             host_key, options.hash_known_hosts))
                                 logit("Failed to add the %s host key for IP "
                                     "address '%.128s' to the list of known "
-                                    "hosts (%.30s).", type, ip,
+                                    "hosts (%.500s).", type, ip,
                                     user_hostfiles[0]);
                         else
                                 logit("Warning: Permanently added the %s host "
@@ -1355,6 +1355,7 @@ ssh_login(Sensitive *sensitive, const char *orighost,
 
         /* key exchange */
         /* authenticate user */
+        debug("Authenticating to %s:%d as '%s'", host, port, server_user);
         if (compat20) {
                 ssh_kex2(host, hostaddr, port);
                 ssh_userauth2(local_user, server_user, host, sensitive);
@@ -1363,7 +1364,7 @@ ssh_login(Sensitive *sensitive, const char *orighost,
                 ssh_kex(host, hostaddr);
                 ssh_userauth1(local_user, server_user, host, sensitive);
 #else
-                fatal("ssh1 is not unsupported");
+                fatal("ssh1 is not supported");
 #endif
         }
         free(local_user);