summaryrefslogtreecommitdiff
path: root/debian/patches/mention-ssh-keygen-on-keychange.patch
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-08-22 16:24:48 +0100
committerColin Watson <cjwatson@debian.org>2017-08-22 16:25:18 +0100
commit801bf6e20895d448d4d25327370c039698ebae98 (patch)
treed26a3913cc91c8e9f530511f01e90f081018453a /debian/patches/mention-ssh-keygen-on-keychange.patch
parent270afdb3d148062730276f507055d2163f463d3b (diff)
parentcda04ac1f5c69710187e602043758063479c3c65 (diff)
Quote IP address in suggested "ssh-keygen -f" calls (closes: #872643).
Diffstat (limited to 'debian/patches/mention-ssh-keygen-on-keychange.patch')
-rw-r--r--debian/patches/mention-ssh-keygen-on-keychange.patch18
1 files changed, 10 insertions, 8 deletions
diff --git a/debian/patches/mention-ssh-keygen-on-keychange.patch b/debian/patches/mention-ssh-keygen-on-keychange.patch
index f2274cb7f..a425efa55 100644
--- a/debian/patches/mention-ssh-keygen-on-keychange.patch
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -1,19 +1,20 @@
1From 315c5a460b33d076edc27a41b0e790ea73cc3b9d Mon Sep 17 00:00:00 2001 1From 78963ce671198209cadd01ebb0aa20ae4fac22d6 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
6Author: Chris Lamb <lamby@debian.org>
6Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843 7Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843
7Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607 8Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607
8Last-Update: 2015-09-08 9Last-Update: 2017-08-22
9 10
10Patch-Name: mention-ssh-keygen-on-keychange.patch 11Patch-Name: mention-ssh-keygen-on-keychange.patch
11--- 12---
12 sshconnect.c | 8 +++++++- 13 sshconnect.c | 9 ++++++++-
13 1 file changed, 7 insertions(+), 1 deletion(-) 14 1 file changed, 8 insertions(+), 1 deletion(-)
14 15
15diff --git a/sshconnect.c b/sshconnect.c 16diff --git a/sshconnect.c b/sshconnect.c
16index 7f169a8f..66c495f4 100644 17index 7f169a8f..881b0886 100644
17--- a/sshconnect.c 18--- a/sshconnect.c
18+++ b/sshconnect.c 19+++ b/sshconnect.c
19@@ -1080,9 +1080,13 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, 20@@ -1080,9 +1080,13 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
@@ -25,18 +26,19 @@ index 7f169a8f..66c495f4 100644
25 error("Offending key for IP in %s:%lu", 26 error("Offending key for IP in %s:%lu",
26 ip_found->file, ip_found->line); 27 ip_found->file, ip_found->line);
27+ error(" remove with:"); 28+ error(" remove with:");
28+ error(" ssh-keygen -f \"%s\" -R %s", 29+ error(" ssh-keygen -f \"%s\" -R \"%s\"",
29+ ip_found->file, ip); 30+ ip_found->file, ip);
30+ } 31+ }
31 } 32 }
32 /* The host key has changed. */ 33 /* The host key has changed. */
33 warn_changed_key(host_key); 34 warn_changed_key(host_key);
34@@ -1090,6 +1094,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, 35@@ -1090,6 +1094,9 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
35 user_hostfiles[0]); 36 user_hostfiles[0]);
36 error("Offending %s key in %s:%lu", key_type(host_found->key), 37 error("Offending %s key in %s:%lu", key_type(host_found->key),
37 host_found->file, host_found->line); 38 host_found->file, host_found->line);
38+ error(" remove with:"); 39+ error(" remove with:");
39+ error(" ssh-keygen -f \"%s\" -R %s", host_found->file, host); 40+ error(" ssh-keygen -f \"%s\" -R \"%s\"",
41+ host_found->file, host);
40 42
41 /* 43 /*
42 * If strict host key checking is in use, the user will have 44 * If strict host key checking is in use, the user will have