diff options
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 7 |
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 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.259 2015/01/28 22:36:00 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.262 2015/05/28 05:41:29 dtucker 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 |
@@ -912,7 +912,7 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, | |||
912 | host_key, options.hash_known_hosts)) | 912 | host_key, options.hash_known_hosts)) |
913 | logit("Failed to add the %s host key for IP " | 913 | logit("Failed to add the %s host key for IP " |
914 | "address '%.128s' to the list of known " | 914 | "address '%.128s' to the list of known " |
915 | "hosts (%.30s).", type, ip, | 915 | "hosts (%.500s).", type, ip, |
916 | user_hostfiles[0]); | 916 | user_hostfiles[0]); |
917 | else | 917 | else |
918 | logit("Warning: Permanently added the %s host " | 918 | logit("Warning: Permanently added the %s host " |
@@ -1355,6 +1355,7 @@ ssh_login(Sensitive *sensitive, const char *orighost, | |||
1355 | 1355 | ||
1356 | /* key exchange */ | 1356 | /* key exchange */ |
1357 | /* authenticate user */ | 1357 | /* authenticate user */ |
1358 | debug("Authenticating to %s:%d as '%s'", host, port, server_user); | ||
1358 | if (compat20) { | 1359 | if (compat20) { |
1359 | ssh_kex2(host, hostaddr, port); | 1360 | ssh_kex2(host, hostaddr, port); |
1360 | ssh_userauth2(local_user, server_user, host, sensitive); | 1361 | ssh_userauth2(local_user, server_user, host, sensitive); |
@@ -1363,7 +1364,7 @@ ssh_login(Sensitive *sensitive, const char *orighost, | |||
1363 | ssh_kex(host, hostaddr); | 1364 | ssh_kex(host, hostaddr); |
1364 | ssh_userauth1(local_user, server_user, host, sensitive); | 1365 | ssh_userauth1(local_user, server_user, host, sensitive); |
1365 | #else | 1366 | #else |
1366 | fatal("ssh1 is not unsupported"); | 1367 | fatal("ssh1 is not supported"); |
1367 | #endif | 1368 | #endif |
1368 | } | 1369 | } |
1369 | free(local_user); | 1370 | free(local_user); |