Merge commit 'mlcastle/master'

[monkeysphere.git] / src / monkeysphere-server

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index bfd5db84477cc40c5c3c9e044ebbd241cd7a0e98..693c062d5554fd858a8671e1fb303536d86a6f4c 100755 (executable)
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -31,14 +31,11 @@ usage: $PGRM <subcommand> [args]
 MonkeySphere server admin tool.
 
 subcommands:
+  update-users (s) [USER]...            update users authorized_keys files
   gen-key (g) [HOSTNAME]                generate gpg key for the server
   show-fingerprint (f)                  show server's host key fingerprint
   publish-key (p)                       publish server key to keyserver
   trust-keys (t) KEYID...               mark keyids as trusted
-
-  update-users (s) [USER]...            update users authorized_keys files
-  update-user-userids (u) USER UID...   add/update user IDs for a user
-  remove-user-userids (r) USER UID...   remove user IDs for a user
   help (h,?)                            this help
 
 EOF
@@ -165,6 +162,12 @@ case $COMMAND in
        for uname in $unames ; do
            MODE="authorized_keys"
 
+           # check all specified users exist
+           if ! getent passwd "$uname" >/dev/null ; then
+               error "----- unknown user '$uname' -----"
+               continue
+           fi
+
            # set authorized_user_ids variable,
            # translate ssh-style path variables
            authorizedUserIDs=$(translate_ssh_variables "$uname" "$AUTHORIZED_USER_IDS")
@@ -204,8 +207,6 @@ case $COMMAND in
 
            log "authorized_keys file updated."
        done
-
-       log "----- done. -----"
        ;;
 
     'gen-key'|'g')
@@ -231,60 +232,6 @@ case $COMMAND in
        done
        ;;
 
-    'update-user-userids'|'update-user-userid'|'u')
-       uname="$1"
-       shift
-       if [ -z "$uname" ] ; then
-           failure "You must specify user."
-       fi
-       if [ -z "$1" ] ; then
-           failure "You must specify at least one user ID."
-       fi
-
-       # set authorized_user_ids variable,
-       # translate ssh-style path variables
-       authorizedUserIDs=$(translate_ssh_variables "$uname" "$AUTHORIZED_USER_IDS")
-
-        # make sure user's authorized_user_ids file exists
-       touch "$authorizedUserIDs"
-
-       # process the user IDs
-       for userID ; do
-           update_userid "$userID" "$authorizedUserIDs"
-       done
-
-       log "Run the following to update user's authorized_keys file:"
-       log "$PGRM update-users $uname"
-       ;;
-
-    'remove-user-userids'|'remove-user-userid'|'r')
-       uname="$1"
-       shift
-       if [ -z "$uname" ] ; then
-           failure "You must specify user."
-       fi
-       if [ -z "$1" ] ; then
-           failure "You must specify at least one user ID."
-       fi
-
-       # set authorized_user_ids variable,
-       # translate ssh-style path variables
-       authorizedUserIDs=$(translate_ssh_variables "$uname" "$AUTHORIZED_USER_IDS")
-
-        # make sure user's authorized_user_ids file exists
-       if [ ! -f "$authorizedUserIDs" ] ; then
-           failure "authorized_user_ids file '$authorizedUserIDs' does not exist."
-       fi
-
-       # process the user IDs
-       for userID ; do
-           remove_userid "$userID" "$authorizedUserIDs"
-       done
-
-       log "Run the following to update user's authorized_keys file:"
-       log "$PGRM update-users $uname"
-       ;;
-
     'help'|'h'|'?')
         usage
         ;;
@@ -294,3 +241,5 @@ case $COMMAND in
 Type '$PGRM help' for usage."
         ;;
 esac
+
+exit "$ERR"