New upstream release (7.6p1)

1 files changed, 6 insertions, 6 deletions

diff --git a/debian/patches/mention-ssh-keygen-on-keychange.patch b/debian/patches/mention-ssh-keygen-on-keychange.patch
index a425efa55..3edb37705 100644
--- a/debian/patches/mention-ssh-keygen-on-keychange.patch
+++ b/debian/patches/mention-ssh-keygen-on-keychange.patch
@@ -1,4 +1,4 @@
-From 78963ce671198209cadd01ebb0aa20ae4fac22d6 Mon Sep 17 00:00:00 2001
+From 19be4218cdb262f7b584b0104ee430de0e24eeb8 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
@@ -14,10 +14,10 @@ Patch-Name: mention-ssh-keygen-on-keychange.patch
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/sshconnect.c b/sshconnect.c
-index 7f169a8f..881b0886 100644
+index 5eed5880..7ce2716c 100644
 --- a/sshconnect.c
 +++ b/sshconnect.c
-@@ -1080,9 +1080,13 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
+@@ -1022,9 +1022,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.");
@@ -32,9 +32,9 @@ index 7f169a8f..881b0886 100644
                 }
                 /* The host key has changed. */
                 warn_changed_key(host_key);
-@@ -1090,6 +1094,9 @@ 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),
+@@ -1033,6 +1037,9 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
+                error("Offending %s key in %s:%lu",
+                    sshkey_type(host_found->key),
                     host_found->file, host_found->line);
 +               error("  remove with:");
 +               error("  ssh-keygen -f \"%s\" -R \"%s\"",