2016-09-30 22:34:19 +02:00
|
|
|
# HG changeset patch
|
2016-10-07 17:57:29 +02:00
|
|
|
# Parent 605a6220fcc2c96e9196681fe480fab16b505ee1
|
2016-09-30 22:34:19 +02:00
|
|
|
Suggest command line for removal of offending keys from known_hosts file
|
|
|
|
|
|
|
|
diff --git a/openssh-7.2p2/sshconnect.c b/openssh-7.2p2/sshconnect.c
|
|
|
|
--- a/openssh-7.2p2/sshconnect.c
|
|
|
|
+++ b/openssh-7.2p2/sshconnect.c
|
|
|
|
@@ -1086,16 +1086,21 @@ check_host_key(char *hostname, struct so
|
|
|
|
ip_found->file, ip_found->line);
|
|
|
|
}
|
|
|
|
/* The host key has changed. */
|
|
|
|
warn_changed_key(host_key);
|
|
|
|
error("Add correct host key in %.100s to get rid of this message.",
|
|
|
|
user_hostfiles[0]);
|
|
|
|
error("Offending %s key in %s:%lu", key_type(host_found->key),
|
|
|
|
host_found->file, host_found->line);
|
|
|
|
+ error("You can use following command to remove all keys for this IP:");
|
|
|
|
+ if (host_found->file)
|
|
|
|
+ error("ssh-keygen -R %s -f %s", hostname, host_found->file);
|
|
|
|
+ else
|
|
|
|
+ error("ssh-keygen -R %s", hostname);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If strict host key checking is in use, the user will have
|
|
|
|
* to edit the key manually and we can only abort.
|
|
|
|
*/
|
|
|
|
if (options.strict_host_key_checking) {
|
|
|
|
error("%s host key for %.200s has changed and you have "
|
|
|
|
"requested strict checking.", type, host);
|