summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-02-09 16:10:03 +0000
committerColin Watson <cjwatson@debian.org>2014-03-19 16:40:06 +0000
commit1ad5769e5d1d878125c48c6bb4a8bea7225940fc (patch)
tree0b1535c5728ff4aaffccf75816e84c32346b632e
parent72aaec921b802c4f1dd73cac0fb21f149e443fc5 (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 ef4d9e04f..4ff5c73bc 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1062,9 +1062,12 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
1062 error("%s. This could either mean that", key_msg); 1062 error("%s. This could either mean that", key_msg);
1063 error("DNS SPOOFING is happening or the IP address for the host"); 1063 error("DNS SPOOFING is happening or the IP address for the host");
1064 error("and its host key have changed at the same time."); 1064 error("and its host key have changed at the same time.");
1065 if (ip_status != HOST_NEW) 1065 if (ip_status != HOST_NEW) {
1066 error("Offending key for IP in %s:%lu", 1066 error("Offending key for IP in %s:%lu",
1067 ip_found->file, ip_found->line); 1067 ip_found->file, ip_found->line);
1068 error(" remove with: ssh-keygen -f \"%s\" -R %s",
1069 ip_found->file, ip);
1070 }
1068 } 1071 }
1069 /* The host key has changed. */ 1072 /* The host key has changed. */
1070 warn_changed_key(host_key); 1073 warn_changed_key(host_key);
@@ -1072,6 +1075,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
1072 user_hostfiles[0]); 1075 user_hostfiles[0]);
1073 error("Offending %s key in %s:%lu", key_type(host_found->key), 1076 error("Offending %s key in %s:%lu", key_type(host_found->key),
1074 host_found->file, host_found->line); 1077 host_found->file, host_found->line);
1078 error(" remove with: ssh-keygen -f \"%s\" -R %s",
1079 host_found->file, host);
1075 1080
1076 /* 1081 /*
1077 * If strict host key checking is in use, the user will have 1082 * If strict host key checking is in use, the user will have