Revert "proposed fix for #1147 by checking for known_hosts file"
authorJameson Graef Rollins <jrollins@finestructure.net>
Fri, 24 Jul 2009 20:11:39 +0000 (16:11 -0400)
committerJameson Graef Rollins <jrollins@finestructure.net>
Fri, 24 Jul 2009 20:11:39 +0000 (16:11 -0400)
This reverts commit 189781e00c89227612942ff7dc30eaa756cb78ae.

This is reverted because we're going with dkg's better solution.

src/monkeysphere

index 94279f4092abe234536b19abad44be68a7b0158a..341b9fdbd4fefa8366a5d38205e99559d19e84d0 100755 (executable)
@@ -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}