summaryrefslogtreecommitdiff
path: root/debian/patches/mention-ssh-keygen-on-keychange.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/mention-ssh-keygen-on-keychange.patch')
-rw-r--r--debian/patches/mention-ssh-keygen-on-keychange.patch21
1 files changed, 11 insertions, 10 deletions
diff --git a/debian/patches/mention-ssh-keygen-on-keychange.patch b/debian/patches/mention-ssh-keygen-on-keychange.patch
index 84804481e..464ddfa1e 100644
--- a/debian/patches/mention-ssh-keygen-on-keychange.patch
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -1,22 +1,22 @@
1From f948cb2d089ebf70b70db3d483d09ad97a0cf371 Mon Sep 17 00:00:00 2001 1From 68580f4a03088e52e1d680389a35655c85613c7a Mon Sep 17 00:00:00 2001
2From: Scott Moser <smoser@ubuntu.com> 2From: Scott Moser <smoser@ubuntu.com>
3Date: Sun, 9 Feb 2014 16:10:03 +0000 3Date: Sun, 9 Feb 2014 16:10:03 +0000
4Subject: Mention ssh-keygen in ssh fingerprint changed warning 4Subject: Mention ssh-keygen in ssh fingerprint changed warning
5 5
6Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843 6Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843
7Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607 7Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607
8Last-Update: 2013-09-14 8Last-Update: 2015-09-08
9 9
10Patch-Name: mention-ssh-keygen-on-keychange.patch 10Patch-Name: mention-ssh-keygen-on-keychange.patch
11--- 11---
12 sshconnect.c | 7 ++++++- 12 sshconnect.c | 8 +++++++-
13 1 file changed, 6 insertions(+), 1 deletion(-) 13 1 file changed, 7 insertions(+), 1 deletion(-)
14 14
15diff --git a/sshconnect.c b/sshconnect.c 15diff --git a/sshconnect.c b/sshconnect.c
16index 8adc943..0c9fc6c 100644 16index 8adc943..4aff104 100644
17--- a/sshconnect.c 17--- a/sshconnect.c
18+++ b/sshconnect.c 18+++ b/sshconnect.c
19@@ -1078,9 +1078,12 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, 19@@ -1078,9 +1078,13 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
20 error("%s. This could either mean that", key_msg); 20 error("%s. This could either mean that", key_msg);
21 error("DNS SPOOFING is happening or the IP address for the host"); 21 error("DNS SPOOFING is happening or the IP address for the host");
22 error("and its host key have changed at the same time."); 22 error("and its host key have changed at the same time.");
@@ -24,18 +24,19 @@ index 8adc943..0c9fc6c 100644
24+ if (ip_status != HOST_NEW) { 24+ if (ip_status != HOST_NEW) {
25 error("Offending key for IP in %s:%lu", 25 error("Offending key for IP in %s:%lu",
26 ip_found->file, ip_found->line); 26 ip_found->file, ip_found->line);
27+ error(" remove with: ssh-keygen -f \"%s\" -R %s", 27+ error(" remove with:");
28+ error(" ssh-keygen -f \"%s\" -R %s",
28+ ip_found->file, ip); 29+ ip_found->file, ip);
29+ } 30+ }
30 } 31 }
31 /* The host key has changed. */ 32 /* The host key has changed. */
32 warn_changed_key(host_key); 33 warn_changed_key(host_key);
33@@ -1088,6 +1091,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, 34@@ -1088,6 +1092,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
34 user_hostfiles[0]); 35 user_hostfiles[0]);
35 error("Offending %s key in %s:%lu", key_type(host_found->key), 36 error("Offending %s key in %s:%lu", key_type(host_found->key),
36 host_found->file, host_found->line); 37 host_found->file, host_found->line);
37+ error(" remove with: ssh-keygen -f \"%s\" -R %s", 38+ error(" remove with:");
38+ host_found->file, host); 39+ error(" ssh-keygen -f \"%s\" -R %s", host_found->file, host);
39 40
40 /* 41 /*
41 * If strict host key checking is in use, the user will have 42 * If strict host key checking is in use, the user will have