summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-08-03 00:55:19 -0700
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-08-03 00:55:19 -0700
commitdbbd1bd42f084dfe780f18875c6f36eb6d4f33b1 (patch)
tree57ddfa527c2ed022422acc7e108194a5c462ed73 /man
parent8e1439bc18f8203d71c1237a25c21374ca17c38c (diff)
- Fixed bug in monkeysphere update-authorized_keys subcommand that had
been preventing disallowed user ids from being properly removed from authorized_keys file. - Fixed file md5sum checking.
Diffstat (limited to 'man')
-rw-r--r--man/man1/monkeysphere.123
1 files changed, 12 insertions, 11 deletions
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 1d1c0e5..43e3fd5 100644
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -37,17 +37,18 @@ if matching keys were found but none were acceptable. `k' may be used
in place of `update-known_hosts'.
.TP
.B update-authorized_keys
-Update the authorized_keys file. For each user ID in the user's
-authorized_user_ids file, gpg will be queried for keys associated with
-that user ID, optionally querying a keyserver. If an acceptable key
-is found (see KEY ACCEPTABILITY in monkeysphere(5)), the key is added
-to the user's authorized_keys file. If a key is found but is
-unacceptable for the user ID, any matching keys are removed from the
-user's authorized_keys file. If no gpg key is found for the user ID,
-nothing is done. This subcommand will exit with a status of 0 if at
-least one acceptable key was found for a user ID, 1 if no matching
-keys were found at all, and 2 if matching keys were found but none
-were acceptable. `a' may be used in place of
+Update the authorized_keys file. First all monkeysphere keys are
+cleared from the authorized_keys file. Then, for each user ID in the
+user's authorized_user_ids file, gpg will be queried for keys
+associated with that user ID, optionally querying a keyserver. If an
+acceptable key is found (see KEY ACCEPTABILITY in monkeysphere(5)),
+the key is added to the user's authorized_keys file. If a key is
+found but is unacceptable for the user ID, any matching keys are
+removed from the user's authorized_keys file. If no gpg key is found
+for the user ID, nothing is done. This subcommand will exit with a
+status of 0 if at least one acceptable key was found for a user ID, 1
+if no matching keys were found at all, and 2 if matching keys were
+found but none were acceptable. `a' may be used in place of
`update-authorized_keys'.
.TP
.B gen-subkey KEYID