X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=0726ff94a61fdd492f6475978fec41bee711ba80;hb=cf7d2f1e843e429a462d2dd11430fd48b0281cb2;hp=9fff77a968567e275991ccd9e2549d96612aa4d0;hpb=bef49a1717ad814a738181b58f83e10d03972ca3;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index 9fff77a..0726ff9 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -45,12 +45,15 @@ Monkeysphere client tool.
 subcommands:
  update-known_hosts (k) [HOST]...    update known_hosts file
  update-authorized_keys (a)          update authorized_keys file
- gen-subkey (g) [KEYID]              generate an authentication subkey
-   --length (-l) BITS                  key length in bits (2048)
  ssh-proxycommand HOST [PORT]        monkeysphere ssh ProxyCommand
    --no-connect                        do not make TCP connection to host
  subkey-to-ssh-agent (s)             store authentication subkey in ssh-agent
  sshfpr (f) KEYID                    output ssh fingerprint of gpg key
+
+ keys-from-userid (u) USERID         output valid keys for user id literal
+ gen-subkey (g) [KEYID]              generate an authentication subkey
+   --length (-l) BITS                  key length in bits (2048)
+
  version (v)                         show version number
  help (h,?)                          this help
 
@@ -268,6 +271,10 @@ case $COMMAND in
 	gpg_ssh_fingerprint "$@"
 	;;
 
+    'keys-from-userid'|'u')
+	keys_from_userid "$@"
+	;;
+
     'version'|'v')
 	version
 	;;