Merge commit 'mlcastle/master'

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index a6cecfd63de025c3b4195842bf6c431f33ecf5c1..58f0fdc632edaeb8f7aa679b24dbfa6e6c81809c 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -35,8 +35,6 @@ MonkeySphere client tool.
 
 subcommands:
   update-known_hosts (k) [HOST]...  update known_hosts file
-  update-userids (u) [USERID]...    add/update user IDs
-  remove-userids (r) [USERID]...    remove user IDs
   update-authorized_keys (a)        update authorized_keys file
   gen-subkey (g) KEYID              generate an 'a' capable subkey
   help (h,?)                        this help
@@ -142,12 +140,9 @@ case $COMMAND in
         # if hosts are specified on the command line, process just
         # those hosts
        if [ "$1" ] ; then
-            for host ; do
-               process_host_known_hosts "$host"
-           done
-           log "known_hosts file updated."
+           process_hosts_known_hosts "$@"
 
-        # otherwise, if no hosts are specified, process every user
+        # otherwise, if no hosts are specified, process every host
         # in the user's known_hosts file
        else
            if [ ! -s "$KNOWN_HOSTS" ] ; then
@@ -155,30 +150,9 @@ case $COMMAND in
            fi
            log "processing known_hosts file..."
            process_known_hosts
-           log "known_hosts file updated."
        fi
-       ;;
 
-    'update-userids'|'update-userid'|'u')
-       if [ -z "$1" ] ; then
-           failure "you must specify at least one userid."
-       fi
-       for userID ; do
-           update_userid "$userID"
-       done
-       log "Run the following to update your monkeysphere authorized_keys file:"
-       log "$PGRM update-authorized_keys"
-       ;;
-
-    'remove-userids'|'remove-userid'|'r')
-       if [ -z "$1" ] ; then
-           failure "you must specify at least one userid."
-       fi
-       for userID ; do
-           remove_userid "$userID"
-       done
-       log "Run the following to update your monkeysphere authorized_keys file:"
-       log "$PGRM update-authorized_keys"
+       log "known_hosts file updated."
        ;;
 
     'update-authorized_keys'|'update-authorized-keys'|'a')
@@ -191,7 +165,7 @@ case $COMMAND in
 
        # process authorized_user_ids file
        log "processing authorized_user_ids file..."
-       process_authorized_user_ids
+       process_authorized_user_ids "$AUTHORIZED_USER_IDS"
        log "authorized_keys file updated."
        ;;