Clean up REQUIRED_KEY_CAPABILITY option passing to process_user_id.

[monkeysphere.git] / src / share / ma / update_users

diff --git a/src/share/ma/update_users b/src/share/ma/update_users
index c180b5689717e0e3b1810478b0ac7957ecd6ad78..0086cd32f57dc8573d8f6d5df8a5585e00bd0fc4 100644 (file)
--- a/src/share/ma/update_users
+++ b/src/share/ma/update_users
@@ -24,12 +24,9 @@ if [ "$1" ] ; then
     unames="$@"
 else        
     # or just look at all users if none specified
-    unames=$(getent passwd | cut -d: -f1)
+    unames=$(list_users)
 fi
 
-# set mode
-MODE="authorized_keys"
-
 # set gnupg home
 GNUPGHOME="$GNUPGHOME_SPHERE"
 
@@ -80,6 +77,7 @@ for uname in $unames ; do
     # translating ssh-style path variables
     authorizedUserIDs=$(translate_ssh_variables "$uname" "$AUTHORIZED_USER_IDS")
     if [ -s "$authorizedUserIDs" ] ; then
+       log debug "authorized_user_ids file found."
        # check permissions on the authorized_user_ids file path
        if check_key_file_permissions "$uname" "$authorizedUserIDs" ; then
             # copy user authorized_user_ids file to temporary
@@ -92,7 +90,7 @@ for uname in $unames ; do
 
            # process authorized_user_ids file, as monkeysphere user
            su_monkeysphere_user \
-               ". ${SYSSHAREDIR}/common; process_authorized_user_ids $TMP_AUTHORIZED_USER_IDS" \
+               ". ${SYSSHAREDIR}/common; STRICT_MODES='$STRICT_MODES' process_authorized_user_ids $TMP_AUTHORIZED_USER_IDS" \
                || returnCode="$?"
        else
            log debug "not processing authorized_user_ids."