ensuring that STRICT_MODES gets passed through to the monkeysphere subshell properly...

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

diff --git a/src/share/ma/update_users b/src/share/ma/update_users
index e9e3cc60387f899469c1361ae12d56c4bde3d0cc..31b53bfc1df13bdebc26e3dd9c24dd411f8b3aae 100644 (file)
--- a/src/share/ma/update_users
+++ b/src/share/ma/update_users
@@ -13,6 +13,7 @@
 
 update_users() {
 
+local returnCode=0
 local unames
 local uname
 local authorizedKeysDir
@@ -23,11 +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
 
-RETURN=0
-
 # set mode
 MODE="authorized_keys"
 
@@ -35,7 +34,7 @@ MODE="authorized_keys"
 GNUPGHOME="$GNUPGHOME_SPHERE"
 
 # the authorized_keys directory
-authorizedKeysDir="${MADATADIR}/authorized_keys"
+authorizedKeysDir="${SYSDATADIR}/authorized_keys"
 
 # check to see if the gpg trust database has been initialized
 if [ ! -s "${GNUPGHOME}/trustdb.gpg" ] ; then
@@ -81,6 +80,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
@@ -93,8 +93,8 @@ 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"
-           RETURN="$?"
+               ". ${SYSSHAREDIR}/common; STRICT_MODES='$STRICT_MODES' process_authorized_user_ids $TMP_AUTHORIZED_USER_IDS" \
+               || returnCode="$?"
        else
            log debug "not processing authorized_user_ids."
        fi
@@ -141,7 +141,7 @@ for uname in $unames ; do
            log error "Failed to install authorized_keys for '$uname'!"
            rm -f "${authorizedKeysDir}/${uname}"
            # indicate that there has been a failure:
-           RETURN=1
+           returnCode=1
        }
     else
        rm -f "${authorizedKeysDir}/${uname}"
@@ -154,4 +154,5 @@ for uname in $unames ; do
     rm -rf "$TMPLOC"
 done
 
+return $returnCode
 }