Merge remote branch 'jrollins/master'

[monkeysphere.git] / src / monkeysphere-host

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 4d3edf4f41bc40cdf290a33c9af9809c889ad475..72205ada4a395d562b35c72169ac3306fe5085ec 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -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=""
@@ -265,7 +270,7 @@ multi_key() {
        if (( i++ > 0 )) ; then
            echo "##############################"
        fi
-       eval "$cmd" "$key"
+       "$cmd" "$key"
     done
 }
 
@@ -422,7 +427,7 @@ case $COMMAND in
        update_pgp_pub_file
        ;;
 
-    'version'|'v')
+    'version'|'--version'|'v')
        version
        ;;