summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-02-09 16:10:03 +0000
committerColin Watson <cjwatson@debian.org>2014-02-09 16:18:41 +0000
commit7a20ce0712e7b7174a0c079e84568a9e8321c42b (patch)
tree38a0059b30fe861f17c62b9a43612b28f77b4588
parentec5991d73abdc0b3c43ea9f8a0e99da045e7beb1 (diff)
Mention ssh-keygen in ssh fingerprint changed warning
Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843 Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607 Last-Update: 2013-09-14 Patch-Name: mention-ssh-keygen-on-keychange.patch
-rw-r--r--sshconnect.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sshconnect.c b/sshconnect.c
index 91fd59a94..bda83b25e 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -981,9 +981,12 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
981 error("%s. This could either mean that", key_msg); 981 error("%s. This could either mean that", key_msg);
982 error("DNS SPOOFING is happening or the IP address for the host"); 982 error("DNS SPOOFING is happening or the IP address for the host");
983 error("and its host key have changed at the same time."); 983 error("and its host key have changed at the same time.");
984 if (ip_status != HOST_NEW) 984 if (ip_status != HOST_NEW) {
985 error("Offending key for IP in %s:%lu", 985 error("Offending key for IP in %s:%lu",
986 ip_found->file, ip_found->line); 986 ip_found->file, ip_found->line);
987 error(" remove with: ssh-keygen -f \"%s\" -R %s",
988 ip_found->file, ip);
989 }
987 } 990 }
988 /* The host key has changed. */ 991 /* The host key has changed. */
989 warn_changed_key(host_key); 992 warn_changed_key(host_key);
@@ -991,6 +994,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
991 user_hostfiles[0]); 994 user_hostfiles[0]);
992 error("Offending %s key in %s:%lu", key_type(host_found->key), 995 error("Offending %s key in %s:%lu", key_type(host_found->key),
993 host_found->file, host_found->line); 996 host_found->file, host_found->line);
997 error(" remove with: ssh-keygen -f \"%s\" -R %s",
998 host_found->file, host);
994 999
995 /* 1000 /*
996 * If strict host key checking is in use, the user will have 1001 * If strict host key checking is in use, the user will have