summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--ssh-vulnkey.c9
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 @@
1openssh (1:5.1p1-3) UNRELEASED; urgency=low
2
3 * Remove unnecessary ssh-vulnkey output in non-verbose mode when no
4 compromised or unknown keys were found (closes: #496495).
5
6 -- Colin Watson <cjwatson@debian.org> Mon, 25 Aug 2008 09:52:33 +0100
7
1openssh (1:5.1p1-2) unstable; urgency=low 8openssh (1:5.1p1-2) unstable; urgency=low
2 9
3 * Look for $SHELL on the path when executing ProxyCommands or 10 * 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)
372 printf("# Some keys on your system have been compromised!\n"); 372 printf("# Some keys on your system have been compromised!\n");
373 printf("# You must replace them using ssh-keygen(1).\n"); 373 printf("# You must replace them using ssh-keygen(1).\n");
374 } 374 }
375 printf("#\n"); 375 if (some_unknown || some_compromised) {
376 printf("# See the ssh-vulnkey(1) manual page for further advice.\n"); 376 printf("#\n");
377 printf("# See the ssh-vulnkey(1) manual page for further advice.\n");
378 } else if (verbosity > 0) {
379 printf("#\n");
380 printf("# No blacklisted keys!\n");
381 }
377 } 382 }
378 383
379 return ret; 384 return ret;