X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=9fff77a968567e275991ccd9e2549d96612aa4d0;hb=34da0040c8d4a76d922dee21cc9bd35230b9c6a5;hp=6f43632307b25d235ed5094457e96fe77de5b7a8;hpb=4ea066ebeb9b01afe213db3455ad1a1ff69c39ea;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index 6f43632..9fff77a 100755
--- 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"}
@@ -210,6 +212,7 @@ LOG_PREFIX=${MONKEYSPHERE_LOG_PREFIX='ms: '}
 export GNUPGHOME
 mkdir -p -m 0700 "$GNUPGHOME"
 export LOG_LEVEL
+export LOG_PREFIX
 
 # get subcommand
 COMMAND="$1"