Merge branch 'master' of git://labs.riseup.net/~micah/monkeysphere

diff --combined src/monkeysphere
index 0726ff94a61fdd492f6475978fec41bee711ba80,14d2bf042593f9ae1f8995a57cbbcf7bf40c33ce..f21ca7c3603d85e1d0cfa432b957c203f1db6509
--- 1/src/monkeysphere
--- 2/src/monkeysphere
+++ b/src/monkeysphere
@@@ -45,15 -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
  
@@@ -219,7 -216,7 +219,7 @@@ export LOG_PREFI
  
  # get subcommand
  COMMAND="$1"
- [ "$COMMAND" ] || failure "Type '$PGRM help' for usage."
+ [ "$COMMAND" ] || $PGRM help
  shift
  
  case $COMMAND in
@@@ -271,10 -268,6 +271,10 @@@
        gpg_ssh_fingerprint "$@"
        ;;
  
 +    'keys-from-userid'|'u')
 +      keys_from_userid "$@"
 +      ;;
 +
      'version'|'v')
        version
        ;;

diff --combined src/monkeysphere-authentication
index f00bf5eef7658f89687f300052f6ea44f50bf57c,057d14eb85179678727cb359d06c39e539c3b31d..7870c0f0ada9b13e5dfd9777a2c09e695f50d181
--- 1/src/monkeysphere-authentication
--- 2/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@@ -136,6 -136,7 +136,6 @@@ LOG_PREFIX=${MONKEYSPHERE_LOG_PREFIX:='
  
  # export variables needed in su invocation
  export DATE
 -export MODE
  export LOG_LEVEL
  export KEYSERVER
  export MONKEYSPHERE_USER
@@@ -151,7 -152,7 +151,7 @@@ export LOG_PREFI
  
  # get subcommand
  COMMAND="$1"
- [ "$COMMAND" ] || failure "Type '$PGRM help' for usage."
+ [ "$COMMAND" ] || $PGRM help
  shift
  
  case $COMMAND in