mention-ssh-keygen-on-keychange.patch: Move example ssh-keygen invocation onto a separate line to make it easier to copy and paste (LP: #1491532).

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 @@
-From f948cb2d089ebf70b70db3d483d09ad97a0cf371 Mon Sep 17 00:00:00 2001
+From 68580f4a03088e52e1d680389a35655c85613c7a Mon Sep 17 00:00:00 2001
 From: Scott Moser <smoser@ubuntu.com>
 Date: Sun, 9 Feb 2014 16:10:03 +0000
 Subject: 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
+Last-Update: 2015-09-08
 
 Patch-Name: mention-ssh-keygen-on-keychange.patch
 ---
- sshconnect.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ sshconnect.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/sshconnect.c b/sshconnect.c
-index 8adc943..0c9fc6c 100644
+index 8adc943..4aff104 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
-@@ -1078,9 +1078,12 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
+@@ -1078,9 +1078,13 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                         error("%s. This could either mean that", key_msg);
                         error("DNS SPOOFING is happening or the IP address for the host");
                         error("and its host key have changed at the same time.");
@@ -24,18 +24,19 @@ index 8adc943..0c9fc6c 100644
 +                       if (ip_status != HOST_NEW) {
                                 error("Offending key for IP in %s:%lu",
                                     ip_found->file, ip_found->line);
-+                               error("  remove with: ssh-keygen -f \"%s\" -R %s",
++                               error("  remove with:");
++                               error("  ssh-keygen -f \"%s\" -R %s",
 +                                   ip_found->file, ip);
 +                       }
                 }
                 /* The host key has changed. */
                 warn_changed_key(host_key);
-@@ -1088,6 +1091,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
+@@ -1088,6 +1092,8 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
                     user_hostfiles[0]);
                 error("Offending %s key in %s:%lu", key_type(host_found->key),
                     host_found->file, host_found->line);
-+               error("  remove with: ssh-keygen -f \"%s\" -R %s",
-+                   host_found->file, host);
++               error("  remove with:");
++               error("  ssh-keygen -f \"%s\" -R %s", host_found->file, host);
  
                 /*
                  * If strict host key checking is in use, the user will have