diff options
author | Scott Moser <smoser@ubuntu.com> | 2014-02-09 16:10:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2014-10-07 14:27:21 +0100 |
commit | 064453886f4c3d8ac0b0c8d015ad614c8bce3b42 (patch) | |
tree | 0fdd71d463a5b0e4b0e36b77e7ea6b5979cca712 | |
parent | 1ecd5db58295874d8b9a7ce98fe1880ab08fbcaf (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.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sshconnect.c b/sshconnect.c index 26116d24b..ab83d0cbb 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1066,9 +1066,12 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, | |||
1066 | error("%s. This could either mean that", key_msg); | 1066 | error("%s. This could either mean that", key_msg); |
1067 | error("DNS SPOOFING is happening or the IP address for the host"); | 1067 | error("DNS SPOOFING is happening or the IP address for the host"); |
1068 | error("and its host key have changed at the same time."); | 1068 | error("and its host key have changed at the same time."); |
1069 | if (ip_status != HOST_NEW) | 1069 | if (ip_status != HOST_NEW) { |
1070 | error("Offending key for IP in %s:%lu", | 1070 | error("Offending key for IP in %s:%lu", |
1071 | ip_found->file, ip_found->line); | 1071 | ip_found->file, ip_found->line); |
1072 | error(" remove with: ssh-keygen -f \"%s\" -R %s", | ||
1073 | ip_found->file, ip); | ||
1074 | } | ||
1072 | } | 1075 | } |
1073 | /* The host key has changed. */ | 1076 | /* The host key has changed. */ |
1074 | warn_changed_key(host_key); | 1077 | warn_changed_key(host_key); |
@@ -1076,6 +1079,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, | |||
1076 | user_hostfiles[0]); | 1079 | user_hostfiles[0]); |
1077 | error("Offending %s key in %s:%lu", key_type(host_found->key), | 1080 | error("Offending %s key in %s:%lu", key_type(host_found->key), |
1078 | host_found->file, host_found->line); | 1081 | host_found->file, host_found->line); |
1082 | error(" remove with: ssh-keygen -f \"%s\" -R %s", | ||
1083 | host_found->file, host); | ||
1079 | 1084 | ||
1080 | /* | 1085 | /* |
1081 | * If strict host key checking is in use, the user will have | 1086 | * If strict host key checking is in use, the user will have |