2 files changed, 14 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 2cdcfa265..70e9a27ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:5.1p1-3) UNRELEASED; urgency=low
+
+  * Remove unnecessary ssh-vulnkey output in non-verbose mode when no
+    compromised or unknown keys were found (closes: #496495).
+
+ -- Colin Watson <cjwatson@debian.org>  Mon, 25 Aug 2008 09:52:33 +0100
+
 openssh (1:5.1p1-2) unstable; urgency=low
 
   * Look for $SHELL on the path when executing ProxyCommands or
diff --git a/ssh-vulnkey.c b/ssh-vulnkey.c
index fd37a1da8..b91f42925 100644
--- a/ssh-vulnkey.c
+++ b/ssh-vulnkey.c
@@ -372,8 +372,13 @@ main(int argc, char **argv)
                         printf("# Some keys on your system have been compromised!\n");
                         printf("# You must replace them using ssh-keygen(1).\n");
                 }
-                printf("#\n");
-                printf("# See the ssh-vulnkey(1) manual page for further advice.\n");
+                if (some_unknown || some_compromised) {
+                        printf("#\n");
+                        printf("# See the ssh-vulnkey(1) manual page for further advice.\n");
+                } else if (verbosity > 0) {
+                        printf("#\n");
+                        printf("# No blacklisted keys!\n");
+                }
         }
 
         return ret;