Merge lp:~smoser/ubuntu/natty/openssh/lp-686607 into lp:ubuntu/natty/openssh

[Scott Moser]

[Colin Watson (cjwatson)]

The patch looks OK, but could you please forward it upstream
(https://bugzilla.mindrot.org/)? I'm trying to reduce the number of
distribution-specific patches to OpenSSH we carry, on the whole.

[Scott Moser (smoser)]

On Thu, 9 Dec 2010, Colin Watson wrote:

> The patch looks OK, but could you please forward it upstream
> (https://bugzilla.mindrot.org/)? I'm trying to reduce the number of
> distribution-specific patches to OpenSSH we carry, on the whole.

I did just send a mail to "openssh-unix-dev mailing list", and replied to
the "confirm message" mail, but it hasn't shown up at [1].

I didn't know about bugzilla.mindrot.

I've just opened https://bugzilla.mindrot.org/show_bug.cgi?id=1843

--
[1] http://lists.mindrot.org/pipermail/openssh-unix-dev/2010-December/thread.html

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-26 14:43:04 +0000
+++ debian/changelog	2010-12-09 15:05:33 +0000
@@ -1,3 +1,9 @@
+openssh (1:5.6p1-2ubuntu2~sm0) UNRELEASED; urgency=low
+
+  * add mention of ssh-keygen in ssh connect warning (LP: #686607)
+
+ -- Scott Moser <[e-mail]>  Tue, 07 Dec 2010 10:34:30 -0500
+
 openssh (1:5.6p1-2ubuntu1) natty; urgency=low
 
   * Resynchronise with Debian.  Remaining changes:

=== added file 'debian/patches/mention-ssh-keygen-on-keychange.patch'
--- debian/patches/mention-ssh-keygen-on-keychange.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/mention-ssh-keygen-on-keychange.patch	2010-12-09 15:05:33 +0000
@@ -0,0 +1,25 @@
+Description: Mention ssh-keygen in ssh fingerprint changed warning
+Author: Scott Moser <[e-mail]>
+Forwarded: no
+Last-Update: 2010-12-07
+--- a/sshconnect.c
++++ b/sshconnect.c
+@@ -908,14 +908,17 @@
+ 			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.");
+-			if (ip_status != HOST_NEW)
++			if (ip_status != HOST_NEW) {
+ 				error("Offending key for IP in %s:%d", ip_file, ip_line);
++				error("  remove with: ssh-keygen -f \"%s\" -R %d", ip_file, ip_line);
++			}
+ 		}
+ 		/* The host key has changed. */
+ 		warn_changed_key(host_key);
+ 		error("Add correct host key in %.100s to get rid of this message.",
+ 		    user_hostfile);
+ 		error("Offending key in %s:%d", host_file, host_line);
++		error("  remove with: ssh-keygen -f \"%s\" -R %d", host_file, host_line);
+ 
+ 		/*
+ 		 * If strict host key checking is in use, the user will have

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-10-26 14:41:11 +0000
+++ debian/patches/series	2010-12-09 15:05:33 +0000
@@ -46,3 +46,4 @@
 # Ubuntu additions
 consolekit.patch
 doc-upstart.patch
+mention-ssh-keygen-on-keychange.patch

=== modified file 'sshconnect.c'
--- sshconnect.c	2010-08-23 22:52:36 +0000
+++ sshconnect.c	2010-12-09 15:05:33 +0000
@@ -908,14 +908,17 @@
 			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.");
-			if (ip_status != HOST_NEW)
+			if (ip_status != HOST_NEW) {
 				error("Offending key for IP in %s:%d", ip_file, ip_line);
+				error("  remove with: ssh-keygen -f \"%s\" -R %s", ip_file, ip);
+			}
 		}
 		/* The host key has changed. */
 		warn_changed_key(host_key);
 		error("Add correct host key in %.100s to get rid of this message.",
 		    user_hostfile);
 		error("Offending key in %s:%d", host_file, host_line);
+		error("  remove with: ssh-keygen -f \"%s\" -R %s", host_file, host);
 
 		/*
 		 * If strict host key checking is in use, the user will have