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.patch20
1 files changed, 14 insertions, 6 deletions
diff --git a/debian/patches/mention-ssh-keygen-on-keychange.patch b/debian/patches/mention-ssh-keygen-on-keychange.patch
index 55c277031..07682155c 100644
--- a/debian/patches/mention-ssh-keygen-on-keychange.patch
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -1,14 +1,22 @@
1Description: Mention ssh-keygen in ssh fingerprint changed warning 1From 7a20ce0712e7b7174a0c079e84568a9e8321c42b Mon Sep 17 00:00:00 2001
2Author: Scott Moser <smoser@ubuntu.com> 2From: Scott Moser <smoser@ubuntu.com>
3Date: Sun, 9 Feb 2014 16:10:03 +0000
4Subject: Mention ssh-keygen in ssh fingerprint changed warning
5
3Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843 6Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1843
4Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607 7Bug-Ubuntu: https://bugs.launchpad.net/bugs/686607
5Last-Update: 2013-09-14 8Last-Update: 2013-09-14
6 9
7Index: b/sshconnect.c 10Patch-Name: mention-ssh-keygen-on-keychange.patch
8=================================================================== 11---
12 sshconnect.c | 7 ++++++-
13 1 file changed, 6 insertions(+), 1 deletion(-)
14
15diff --git a/sshconnect.c b/sshconnect.c
16index 91fd59a..bda83b2 100644
9--- a/sshconnect.c 17--- a/sshconnect.c
10+++ b/sshconnect.c 18+++ b/sshconnect.c
11@@ -981,9 +981,12 @@ 19@@ -981,9 +981,12 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
12 error("%s. This could either mean that", key_msg); 20 error("%s. This could either mean that", key_msg);
13 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");
14 error("and its host key have changed at the same time."); 22 error("and its host key have changed at the same time.");
@@ -22,7 +30,7 @@ Index: b/sshconnect.c
22 } 30 }
23 /* The host key has changed. */ 31 /* The host key has changed. */
24 warn_changed_key(host_key); 32 warn_changed_key(host_key);
25@@ -991,6 +994,8 @@ 33@@ -991,6 +994,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
26 user_hostfiles[0]); 34 user_hostfiles[0]);
27 error("Offending %s key in %s:%lu", key_type(host_found->key), 35 error("Offending %s key in %s:%lu", key_type(host_found->key),
28 host_found->file, host_found->line); 36 host_found->file, host_found->line);