Make 'ssh-vulnkey -v' output each file name it examines (thanks, Hugh

Daniel).

3 files changed, 5 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 1df45586f..7c1c5fc49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ openssh (1:4.7p1-11) UNRELEASED; urgency=low
   * Add key type to ssh-vulnkey output.
   * Fix error output if ssh-vulnkey fails to read key files, with the
     exception of host keys unless -a was given (thanks, Hugh Daniel).
+  * Make 'ssh-vulnkey -v' output each file name it examines (thanks, Hugh
+    Daniel).
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 17 May 2008 08:48:45 +0200
 
diff --git a/ssh-vulnkey.1 b/ssh-vulnkey.1
index d0a450651..f8a575fe2 100644
--- a/ssh-vulnkey.1
+++ b/ssh-vulnkey.1
@@ -99,7 +99,7 @@ looks like this:
 .Pp
 Each line is of the following format (any lines beginning with
 .Dq #
-should be ignored by scripts, although there will be none at present):
+should be ignored by scripts):
 .Pp
 .Dl Ar filename : Ns Ar line : Ar status : Ar type Ar size Ar fingerprint Ar comment
 .Pp
diff --git a/ssh-vulnkey.c b/ssh-vulnkey.c
index cade7b08a..3ffc3fa0c 100644
--- a/ssh-vulnkey.c
+++ b/ssh-vulnkey.c
@@ -154,6 +154,8 @@ do_filename(const char *filename, int quiet_open)
                                 perror(filename);
                         return -1;
                 }
+                if (verbosity > 0)
+                        printf("# %s\n", filename);
         } else
                 f = stdin;
         while (read_keyfile_line(f, filename, line, sizeof(line),