X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=1ba51d79619de218f1c50bf205e752ec50232145;hb=7c315f56f1a5b9ed7742f48a9a0b836a47f44458;hp=782ba5ed0e329ff4e346df18de8190ac7dcd7039;hpb=ad0a9cc0958b30f5be851453ea22c151097fad0c;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index 782ba5e..1ba51d7 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -31,11 +31,12 @@ GREP_OPTIONS=
 usage() {
 cat <<EOF
 usage: $PGRM <subcommand> [args]
-Monkeysphere client tool.
+MonkeySphere client tool.
 
 subcommands:
   update-known_hosts (k) [HOST]...  update known_hosts file
-  update-userids (u) [USERID]...    add/update userid
+  update-userids (u) [USERID]...    add/update user IDs
+  remove-userids (r) [USERID]...    remove user IDs
   update-authorized_keys (a)        update authorized_keys file
   gen-ae-subkey (g) KEYID           generate an 'ae' capable subkey
   help (h,?)                        this help
@@ -164,19 +165,32 @@ case $COMMAND in
 	fi
 	;;
 
-    'update-userids'|'u')
+    'update-userids'|'update-userid'|'u')
 	if [ -z "$1" ] ; then
 	    failure "you must specify at least one userid."
 	fi
 	for userID ; do
 	    update_userid "$userID" "$userKeysCacheDir"
 	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"
 	;;
 
     'update-authorized_keys'|'update-authorized-keys'|'a')
 	MODE='authorized_keys'
 
-        # make sure authorized_user_ids file exists
+        # fail if the authorized_user_ids file is empty
 	if [ ! -s "$AUTHORIZED_USER_IDS" ] ; then
 	    failure "$AUTHORIZED_USER_IDS is empty."
 	fi