diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-02-08 10:47:06 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-02-08 10:47:06 +0000 |
| commit | 4c1922330aa5ba7f2b1c3f57b088d94455393f59 (patch) | |
| tree | 207c0a82db716bcfb4c105173c3bf593cb20b62c /usr.bin | |
| parent | ef091200859aa63fff148f79a4f30a3275b104ea (diff) | |
%.30s is too short for IPv6 numeric address. use %.128s for now. markus ok
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 8 | ||||
| -rw-r--r-- | usr.bin/ssh/sshconnect1.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/sshconnect2.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index 17064326302..3b9dc13a81b 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.93 2001/02/04 15:32:26 stevesk Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.94 2001/02/08 10:47:04 itojun Exp $"); #include <openssl/bn.h> @@ -584,10 +584,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; @@ -697,7 +697,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); diff --git a/usr.bin/ssh/sshconnect1.c b/usr.bin/ssh/sshconnect1.c index 80b769b47de..9980ebe2568 100644 --- a/usr.bin/ssh/sshconnect1.c +++ b/usr.bin/ssh/sshconnect1.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect1.c,v 1.22 2001/02/03 10:08:37 markus Exp $"); +RCSID("$OpenBSD: sshconnect1.c,v 1.23 2001/02/08 10:47:04 itojun Exp $"); #include <openssl/bn.h> #include <openssl/evp.h> @@ -1032,7 +1032,7 @@ ssh_userauth( options.password_authentication && !options.batch_mode) { char prompt[80]; - snprintf(prompt, sizeof(prompt), "%.30s@%.40s's password: ", + snprintf(prompt, sizeof(prompt), "%.30s@%.128s's password: ", server_user, host); if (try_password_authentication(prompt)) return; diff --git a/usr.bin/ssh/sshconnect2.c b/usr.bin/ssh/sshconnect2.c index bc17a613771..655de11ffac 100644 --- a/usr.bin/ssh/sshconnect2.c +++ b/usr.bin/ssh/sshconnect2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.42 2001/02/06 22:26:17 markus Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.43 2001/02/08 10:47:05 itojun Exp $"); #include <openssl/bn.h> #include <openssl/md5.h> @@ -646,7 +646,7 @@ userauth_passwd(Authctxt *authctxt) if(attempt != 1) error("Permission denied, please try again."); - snprintf(prompt, sizeof(prompt), "%.30s@%.40s's password: ", + snprintf(prompt, sizeof(prompt), "%.30s@%.128s's password: ", authctxt->server_user, authctxt->host); password = read_passphrase(prompt, 0); packet_start(SSH2_MSG_USERAUTH_REQUEST); |