X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=475053349f77ce8664e89be0efb7f38ae1ded33b;hb=bb1da608577e67662ecf7042badf2c4ba3c522c1;hp=94279f4092abe234536b19abad44be68a7b0158a;hpb=478dfc8331177d7397a8430e5d04bffcd601ab2b;p=monkeysphere.git diff --git a/src/monkeysphere b/src/monkeysphere index 94279f4..4750533 100755 --- a/src/monkeysphere +++ b/src/monkeysphere @@ -194,20 +194,10 @@ if [ -z "$KEYSERVER" ] ; then fi fi PROMPT=${MONKEYSPHERE_PROMPT:=$PROMPT} -# check the known_hosts file -if [ "$MONKEYSPHERE_KNOWN_HOSTS" ] ; then - if [ -f "$MONKEYSPHERE_KNOWN_HOSTS" ] ; then - KNOWN_HOSTS="$MONKEYSPHERE_KNOWN_HOSTS" - else - failure "specified monkeysphere known_hosts file '$MONKEYSPHERE_KNOWN_HOSTS' does not exist." - fi -fi -[ -d $(dirname "$KNOWN_HOSTS") ] \ - || mkdir -m 0700 $(dirname "$KNOWN_HOSTS") -[ -f "$KNOWN_HOSTS" ] \ - || touch "$KNOWN_HOSTS" +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"}