Merge remote branch 'jrollins/master'

diff --combined src/monkeysphere-host
index 17330216301a7ef412054269a0986b0637c77c66,4d3edf4f41bc40cdf290a33c9af9809c889ad475..72205ada4a395d562b35c72169ac3306fe5085ec
--- 1/src/monkeysphere-host
--- 2/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@@ -110,11 -110,6 +110,11 @@@ update_pgp_pub_file() 
  # all-number (e.g. ssh://666.666), which are technically not allowed
  # (though some exist on the 'net, apparently)
  
 +# FIXME: this will probably misbehave if raw IP addresses are provided,
 +# either IPv4 or IPv6 using the bracket notation.
 +
 +# FIXME: this doesn't address the use of hashed User IDs.
 +
  check_service_name() {
      local name="$1"
      local errs=""
@@@ -256,11 -251,12 +256,12 @@@ multi_key() 
      shift
      local keys=$@
      local i=0
-     local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
      local key
  
      check_no_keys
  
+     local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
+ 
      if [[ -z "$1" || "$1" == '--all' ]] ; then
        keys="${fprs[@]}"
      fi
@@@ -269,7 -265,7 +270,7 @@@
        if (( i++ > 0 )) ; then
            echo "##############################"
        fi
 -      eval "$cmd" "$key"
 +      "$cmd" "$key"
      done
  }
  
@@@ -426,7 -422,7 +427,7 @@@ case $COMMAND i
        update_pgp_pub_file
        ;;
  
 -    'version'|'v')
 +    'version'|'--version'|'v')
        version
        ;;