switched $USER to $FILE_OWNER; new name is more semantically clear and less likely...

diff --git a/src/monkeysphere b/src/monkeysphere
index aa9276cc426ece8925f55f475db789d704deeb3a..1641d32ef47a15f6fe7a4660391a1d38f1a5b806 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -189,8 +189,8 @@ export GNUPGHOME
 mkdir -p -m 0700 "$GNUPGHOME"
 export LOG_LEVEL
 
-# explicitly set the USER variable, for checking file permissions
-export USER=$(whoami)
+# explicitly set the FILE_OWNER variable, for checking file permissions
+export FILE_OWNER=$(whoami)
 
 # get subcommand
 COMMAND="$1"

diff --git a/src/share/common b/src/share/common
index c6d6b8e66e46097753b6a40323de0411367588f4..dd5dc162a31f4183374237d018baf1d5dcada1d4 100644 (file)
--- a/src/share/common
+++ b/src/share/common
@@ -846,7 +846,7 @@ update_known_hosts() {
     (umask 0022 && touch "$KNOWN_HOSTS")
 
     # check permissions on the known_hosts file path
-    check_key_file_permissions "$USER" "$KNOWN_HOSTS" || failure
+    check_key_file_permissions "$FILE_OWNER" "$KNOWN_HOSTS" || failure
 
     # create a lockfile on known_hosts:
     lock create "$KNOWN_HOSTS"
@@ -1000,7 +1000,7 @@ update_authorized_keys() {
     log debug " $AUTHORIZED_KEYS"
 
     # check permissions on the authorized_keys file path
-    check_key_file_permissions "$USER" "$AUTHORIZED_KEYS" || failure
+    check_key_file_permissions "$FILE_OWNER" "$AUTHORIZED_KEYS" || failure
 
     # create a lockfile on authorized_keys
     lock create "$AUTHORIZED_KEYS"
@@ -1076,7 +1076,7 @@ process_authorized_user_ids() {
     log debug " $authorizedUserIDs"
 
     # check permissions on the authorized_user_ids file path
-    check_key_file_permissions "$USER" "$authorizedUserIDs" || failure
+    check_key_file_permissions "$FILE_OWNER" "$authorizedUserIDs" || failure
 
     if ! meat "$authorizedUserIDs" > /dev/null ; then
        log debug " no user IDs to process."

diff --git a/src/share/ma/update_users b/src/share/ma/update_users
index 195e9828f8c49a937647963b9a4dbab567a86559..a48bbd10c9d1ad528c8b499a15be7437d6d73d6c 100644 (file)
--- a/src/share/ma/update_users
+++ b/src/share/ma/update_users
@@ -88,7 +88,7 @@ for uname in $unames ; do
            cat "$authorizedUserIDs" > "$TMP_AUTHORIZED_USER_IDS"
 
            # export needed variables
-           export USER="$uname"
+           export FILE_OWNER="$uname"
            export AUTHORIZED_KEYS
            export TMP_AUTHORIZED_USER_IDS