added MONKEYSPHERE_STRICT_MODES environment option to disable permissions checking.

[monkeysphere.git] / src / monkeysphere

diff --git a/src/monkeysphere b/src/monkeysphere
index 6f43632307b25d235ed5094457e96fe77de5b7a8..475053349f77ce8664e89be0efb7f38ae1ded33b 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -144,7 +144,8 @@ check_gpg_authentication_subkey() {
        if [ "$validity" = 'u' ] ; then
            echo "A valid authentication key already exists for primary key '$keyID'." 1>&2
            if [ "$PROMPT" = "true" ] ; then
-               read -p "Are you sure you would like to generate another one? (y/N) " OK; OK=${OK:N}
+               printf "Are you sure you would like to generate another one? (y/N) " >&2
+               read OK; OK=${OK:N}
                if [ "${OK/y/Y}" != 'Y' ] ; then
                    failure "aborting."
                fi
@@ -196,6 +197,7 @@ PROMPT=${MONKEYSPHERE_PROMPT:=$PROMPT}
 KNOWN_HOSTS=${MONKEYSPHERE_KNOWN_HOSTS:=$KNOWN_HOSTS}
 HASH_KNOWN_HOSTS=${MONKEYSPHERE_HASH_KNOWN_HOSTS:=$HASH_KNOWN_HOSTS}
 AUTHORIZED_KEYS=${MONKEYSPHERE_AUTHORIZED_KEYS:=$AUTHORIZED_KEYS}
+STRICT_MODES=${MONKEYSPHERE_STRICT_MODES:=$STRICT_MODES}
 
 # other variables not in config file
 AUTHORIZED_USER_IDS=${MONKEYSPHERE_AUTHORIZED_USER_IDS:="${MONKEYSPHERE_HOME}/authorized_user_ids"}