From: Jameson Graef Rollins Date: Fri, 24 Jul 2009 20:11:39 +0000 (-0400) Subject: Revert "proposed fix for #1147 by checking for known_hosts file" X-Git-Tag: monkeysphere_0.26~22 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=65dfc0ba7f918b0a2787c1cc918e70fe3f247438;p=monkeysphere.git Revert "proposed fix for #1147 by checking for known_hosts file" This reverts commit 189781e00c89227612942ff7dc30eaa756cb78ae. This is reverted because we're going with dkg's better solution. --- diff --git a/src/monkeysphere b/src/monkeysphere index 94279f4..341b9fd 100755 --- a/src/monkeysphere +++ b/src/monkeysphere @@ -194,18 +194,7 @@ 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}