fix some return code setting stuf that was no longer being used, and change name...

diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index c00965342deed2babe03720e85cdef84ad674345..c5c48d591f84eba239e69a33ba539f86673f8e82 100755 (executable)
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -42,9 +42,6 @@ DATE=$(date -u '+%FT%T')
 # unset some environment variables that could screw things up
 unset GREP_OPTIONS
 
-# default return code
-RETURN=0
-
 ########################################################################
 # FUNCTIONS
 ########################################################################
@@ -211,5 +208,3 @@ case $COMMAND in
 Type '$PGRM help' for usage."
         ;;
 esac
-
-exit "$RETURN"

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index c454354f5b60fd1e85d541401021d25614cd5045..5e7a9312759f0e8e2772cd868d8a8c79d6eba57c 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -41,9 +41,6 @@ DATE=$(date -u '+%FT%T')
 # unset some environment variables that could screw things up
 unset GREP_OPTIONS
 
-# default return code
-RETURN=0
-
 ########################################################################
 # FUNCTIONS
 ########################################################################
@@ -327,5 +324,3 @@ case $COMMAND in
 Type '$PGRM help' for usage."
         ;;
 esac
-
-exit "$RETURN"

diff --git a/src/share/ma/update_users b/src/share/ma/update_users
index bfefc31cdb83b294175131d502136b17520e7ce5..c180b5689717e0e3b1810478b0ac7957ecd6ad78 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
@@ -26,8 +27,6 @@ else
     unames=$(getent passwd | cut -d: -f1)
 fi
 
-RETURN=0
-
 # set mode
 MODE="authorized_keys"
 
@@ -94,7 +93,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" \
-               || RETURN="$?"
+               || returnCode="$?"
        else
            log debug "not processing authorized_user_ids."
        fi
@@ -141,7 +140,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,5 +153,5 @@ for uname in $unames ; do
     rm -rf "$TMPLOC"
 done
 
-return $RETURN
+return $returnCode
 }