Merge commit 'mlcastle/master'

[monkeysphere.git] / src / monkeysphere-server

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 154c1462915739110f2af49269d05b43caa6ed11..693c062d5554fd858a8671e1fb303536d86a6f4c 100755 (executable)
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -162,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")
@@ -201,8 +207,6 @@ case $COMMAND in
 
            log "authorized_keys file updated."
        done
-
-       log "----- done. -----"
        ;;
 
     'gen-key'|'g')
@@ -237,3 +241,5 @@ case $COMMAND in
 Type '$PGRM help' for usage."
         ;;
 esac
+
+exit "$ERR"