diff options
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | ssh-vulnkey.1 | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 15abbe97a..ac7f5d46f 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -42,6 +42,8 @@ openssh (1:4.7p1-11) UNRELEASED; urgency=low | |||
42 | * Add -v (verbose) option to ssh-vulnkey, and don't print output for keys | 42 | * Add -v (verbose) option to ssh-vulnkey, and don't print output for keys |
43 | that have a blacklist file but that are not listed unless in verbose | 43 | that have a blacklist file but that are not listed unless in verbose |
44 | mode (thanks, Hugh Daniel). | 44 | mode (thanks, Hugh Daniel). |
45 | * Move ssh-vulnkey's exit status documentation to a separate section | ||
46 | (thanks, Hugh Daniel). | ||
45 | 47 | ||
46 | -- Colin Watson <cjwatson@debian.org> Sat, 17 May 2008 08:48:45 +0200 | 48 | -- Colin Watson <cjwatson@debian.org> Sat, 17 May 2008 08:48:45 +0200 |
47 | 49 | ||
diff --git a/ssh-vulnkey.1 b/ssh-vulnkey.1 index 8e681115a..aa3271e46 100644 --- a/ssh-vulnkey.1 +++ b/ssh-vulnkey.1 | |||
@@ -81,10 +81,6 @@ for example: | |||
81 | .Pp | 81 | .Pp |
82 | .Dl $ ssh-keyscan -t rsa remote.example.org | ssh-vulnkey - | 82 | .Dl $ ssh-keyscan -t rsa remote.example.org | ssh-vulnkey - |
83 | .Pp | 83 | .Pp |
84 | .Nm | ||
85 | will exit zero if any of the given keys were in the compromised list, | ||
86 | otherwise non-zero. | ||
87 | .Pp | ||
88 | Unless the | 84 | Unless the |
89 | .Cm PermitBlacklistedKeys | 85 | .Cm PermitBlacklistedKeys |
90 | option is used, | 86 | option is used, |
@@ -126,6 +122,10 @@ This option causes | |||
126 | .Nm | 122 | .Nm |
127 | to produce output for all keys. | 123 | to produce output for all keys. |
128 | .El | 124 | .El |
125 | .Sh EXIT STATUS | ||
126 | .Nm | ||
127 | will exit zero if any of the given keys were in the compromised list, | ||
128 | otherwise non-zero. | ||
129 | .Sh BLACKLIST FILE FORMAT | 129 | .Sh BLACKLIST FILE FORMAT |
130 | The blacklist file may start with comments, on lines starting with | 130 | The blacklist file may start with comments, on lines starting with |
131 | .Dq # . | 131 | .Dq # . |