summaryrefslogtreecommitdiff
path: root/man/man1
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-08-20 21:09:36 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-08-20 21:09:36 -0400
commite32ef4a7da9587ad8bd22f8ed1f517257417f713 (patch)
tree8c9c221283f1c107a16fb87795030e1fb1f51b67 /man/man1
parent35f16f7e3eaa05b04e97337d7ef0188fb3050f8e (diff)
documenting subkey-to-ssh-agent in monkeysphere(1).
Diffstat (limited to 'man/man1')
-rw-r--r--man/man1/monkeysphere.136
1 files changed, 25 insertions, 11 deletions
diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index db35a38..92ba2fa 100644
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -24,17 +24,20 @@ connection authentication.
.B update-known_hosts [HOST]...
Update the known_hosts file. For each specified host, gpg will be
queried for a key associated with the host URI (see HOST
-IDENTIFICATION in monkeysphere(5)), optionally querying a keyserver.
+IDENTIFICATION in
+.BR monkeysphere(5)),
+optionally querying a keyserver.
If an acceptable key is found for the host (see KEY ACCEPTABILITY in
-monkeysphere(5)), the key is added to the user's known_hosts file. If
-a key is found but is unacceptable for the host, any matching keys are
-removed from the user's known_hosts file. If no gpg key is found for
-the host, nothing is done. If no hosts are specified, all hosts
-listed in the known_hosts file will be processed. This subcommand
-will exit with a status of 0 if at least one acceptable key was found
-for a specified host, 1 if no matching keys were found at all, and 2
-if matching keys were found but none were acceptable. `k' may be used
-in place of `update-known_hosts'.
+.BR monkeysphere(5)),
+the key is added to the user's known_hosts file. If a key is found
+but is unacceptable for the host, any matching keys are removed from
+the user's known_hosts file. If no gpg key is found for the host,
+nothing is done. If no hosts are specified, all hosts listed in the
+known_hosts file will be processed. This subcommand will exit with a
+status of 0 if at least one acceptable key was found for a specified
+host, 1 if no matching keys were found at all, and 2 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 the user executing the command
@@ -43,7 +46,8 @@ monkeysphere keys are cleared from the authorized_keys file. Then, or
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.
+.BR 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
@@ -61,6 +65,15 @@ the `-e' or `--expire' option (prompt otherwise). If no key ID is
specified, but only one key exists in the secret keyring, that key
will be used. `g' may be used in place of `gen-subkey'.
.TP
+.B subkey-to-ssh-agent [ssh-add arguments]
+Push all authentication-capable subkeys in your GnuPG secret keyring
+into your running ssh-agent. Additional arguments are passed through
+to
+.BR ssh-add (1).
+For example, to remove the authentication subkeys, pass an additional
+`-d' argument. To require confirmation on each use of the key, pass
+`-c'. `s' may be used in place of `subkey-to-ssh-agent'.
+.TP
.B help
Output a brief usage summary. `h' or `?' may be used in place of
`help'.
@@ -112,4 +125,5 @@ Kahn Gillmor <dkg@fifthhorseman.net>
.BR monkeysphere-server (8),
.BR monkeysphere (5),
.BR ssh (1),
+.BR ssh-add (1),
.BR gpg (1)