From 432768612c21549792714fbc2c4fcf5e49f22a65 Mon Sep 17 00:00:00 2001 From: Kevin Steves Date: Sun, 11 Feb 2001 13:56:43 +0000 Subject: 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 --- ChangeLog | 4 ++-- sshconnect.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b62c0d6d..8eaf02512 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 2de726244..389d65985 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -265,7 +265,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, 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 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, 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 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, 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); -- cgit v1.2.3