X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=e84ee63c24254041bd05becd0d0d4b2ce4712099;hb=97e51c1dcf3f4a582cb9ff8a83d56eda8b22b292;hp=bc390ccca5e239a83e00e594f576d16cdc6e8fd6;hpb=593cd32c436edeb594714dbd0d4421add227c2c3;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index bc390cc..e84ee63 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -50,7 +50,7 @@ subcommands:
  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
+ keys-for-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)
 
@@ -275,8 +275,13 @@ case $COMMAND in
 	gpg_ssh_fingerprint "$@"
 	;;
 
-    'keys-from-userid'|'u')
-	keys_from_userid "$@"
+    'keys-for-userid'|'u')
+	keys_for_userid "$@"
+	;;
+
+    'keys-from-userid')
+	echo "Warning: 'keys-from-userid' is deprecated.  Please use 'keys-for-userid' instead." >&2
+	keys_for_userid "$@"
 	;;
 
     'version'|'--version'|'v')