diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | sshconnect.c | 8 |
2 files changed, 6 insertions, 6 deletions
@@ -31,7 +31,7 @@ | |||
31 | [sshconnect2.c] | 31 | [sshconnect2.c] |
32 | do not ask for passphrase in batch mode; report from ejb@ql.org | 32 | do not ask for passphrase in batch mode; report from ejb@ql.org |
33 | - itojun@cvs.opebsd.org 2001/02/08 10:47:05 | 33 | - itojun@cvs.opebsd.org 2001/02/08 10:47:05 |
34 | [sshconnect1.c sshconnect2.c] | 34 | [sshconnect.c sshconnect1.c sshconnect2.c] |
35 | %.30s is too short for IPv6 numeric address. use %.128s for now. | 35 | %.30s is too short for IPv6 numeric address. use %.128s for now. |
36 | markus ok | 36 | markus ok |
37 | - markus@cvs.openbsd.org 2001/02/09 12:28:35 | 37 | - markus@cvs.openbsd.org 2001/02/09 12:28:35 |
@@ -3887,4 +3887,4 @@ | |||
3887 | - Wrote replacements for strlcpy and mkdtemp | 3887 | - Wrote replacements for strlcpy and mkdtemp |
3888 | - Released 1.0pre1 | 3888 | - Released 1.0pre1 |
3889 | 3889 | ||
3890 | $Id: ChangeLog,v 1.740 2001/02/11 11:35:11 djm Exp $ | 3890 | $Id: ChangeLog,v 1.741 2001/02/11 13:56:43 stevesk Exp $ |
diff --git a/sshconnect.c b/sshconnect.c index 2de726244..389d65985 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -265,7 +265,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, | |||
265 | temporarily_use_uid(original_real_uid); | 265 | temporarily_use_uid(original_real_uid); |
266 | if (connect(sock, ai->ai_addr, ai->ai_addrlen) >= 0) { | 266 | if (connect(sock, ai->ai_addr, ai->ai_addrlen) >= 0) { |
267 | /* Successful connection. */ | 267 | /* Successful connection. */ |
268 | memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen); | 268 | memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen); |
269 | restore_uid(); | 269 | restore_uid(); |
270 | break; | 270 | break; |
271 | } else { | 271 | } else { |
@@ -596,10 +596,10 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
596 | debug("Found key in %s:%d", host_file, host_line); | 596 | debug("Found key in %s:%d", host_file, host_line); |
597 | if (options.check_host_ip && ip_status == HOST_NEW) { | 597 | if (options.check_host_ip && ip_status == HOST_NEW) { |
598 | if (!add_host_to_hostfile(user_hostfile, ip, host_key)) | 598 | if (!add_host_to_hostfile(user_hostfile, ip, host_key)) |
599 | log("Failed to add the %s host key for IP address '%.30s' to the list of known hosts (%.30s).", | 599 | log("Failed to add the %s host key for IP address '%.128s' to the list of known hosts (%.30s).", |
600 | type, ip, user_hostfile); | 600 | type, ip, user_hostfile); |
601 | else | 601 | else |
602 | log("Warning: Permanently added the %s host key for IP address '%.30s' to the list of known hosts.", | 602 | log("Warning: Permanently added the %s host key for IP address '%.128s' to the list of known hosts.", |
603 | type, ip); | 603 | type, ip); |
604 | } | 604 | } |
605 | break; | 605 | break; |
@@ -709,7 +709,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, | |||
709 | if (options.check_host_ip && host_status != HOST_CHANGED && | 709 | if (options.check_host_ip && host_status != HOST_CHANGED && |
710 | ip_status == HOST_CHANGED) { | 710 | ip_status == HOST_CHANGED) { |
711 | log("Warning: the %s host key for '%.200s' " | 711 | log("Warning: the %s host key for '%.200s' " |
712 | "differs from the key for the IP address '%.30s'", | 712 | "differs from the key for the IP address '%.128s'", |
713 | type, host, ip); | 713 | type, host, ip); |
714 | if (host_status == HOST_OK) | 714 | if (host_status == HOST_OK) |
715 | log("Matching host key in %s:%d", host_file, host_line); | 715 | log("Matching host key in %s:%d", host_file, host_line); |