missed sshconnect.c part of:
- itojun@cvs.opebsd.org 2001/02/08 10:47:05
[sshconnect.c sshconnect1.c sshconnect2.c]
%.30s is too short for IPv6 numeric address. use %.128s for now.
markus ok
diff --git a/ChangeLog b/ChangeLog
index 7b62c0d..8eaf025 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,7 +31,7 @@
[sshconnect2.c]
do not ask for passphrase in batch mode; report from ejb@ql.org
- itojun@cvs.opebsd.org 2001/02/08 10:47:05
- [sshconnect1.c sshconnect2.c]
+ [sshconnect.c sshconnect1.c sshconnect2.c]
%.30s is too short for IPv6 numeric address. use %.128s for now.
markus ok
- markus@cvs.openbsd.org 2001/02/09 12:28:35
@@ -3887,4 +3887,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.740 2001/02/11 11:35:11 djm Exp $
+$Id: ChangeLog,v 1.741 2001/02/11 13:56:43 stevesk Exp $
diff --git a/sshconnect.c b/sshconnect.c
index 2de7262..389d659 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -265,7 +265,7 @@
temporarily_use_uid(original_real_uid);
if (connect(sock, ai->ai_addr, ai->ai_addrlen) >= 0) {
/* Successful connection. */
- memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen);
+ memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen);
restore_uid();
break;
} else {
@@ -596,10 +596,10 @@
debug("Found key in %s:%d", host_file, host_line);
if (options.check_host_ip && ip_status == HOST_NEW) {
if (!add_host_to_hostfile(user_hostfile, ip, host_key))
- log("Failed to add the %s host key for IP address '%.30s' to the list of known hosts (%.30s).",
+ log("Failed to add the %s host key for IP address '%.128s' to the list of known hosts (%.30s).",
type, ip, user_hostfile);
else
- log("Warning: Permanently added the %s host key for IP address '%.30s' to the list of known hosts.",
+ log("Warning: Permanently added the %s host key for IP address '%.128s' to the list of known hosts.",
type, ip);
}
break;
@@ -709,7 +709,7 @@
if (options.check_host_ip && host_status != HOST_CHANGED &&
ip_status == HOST_CHANGED) {
log("Warning: the %s host key for '%.200s' "
- "differs from the key for the IP address '%.30s'",
+ "differs from the key for the IP address '%.128s'",
type, host, ip);
if (host_status == HOST_OK)
log("Matching host key in %s:%d", host_file, host_line);