From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Fri, 24 Jul 2009 12:23:45 +0000 (-0400)
Subject: proposed fix for #1147 by checking for known_hosts file
X-Git-Tag: monkeysphere_0.26~26
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=189781e00c89227612942ff7dc30eaa756cb78ae

proposed fix for #1147 by checking for known_hosts file
---

diff --git a/src/monkeysphere b/src/monkeysphere
index 341b9fd..94279f4 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -194,7 +194,18 @@ if [ -z "$KEYSERVER" ] ; then
     fi
 fi
 PROMPT=${MONKEYSPHERE_PROMPT:=$PROMPT}
-KNOWN_HOSTS=${MONKEYSPHERE_KNOWN_HOSTS:=$KNOWN_HOSTS}
+# 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"
 HASH_KNOWN_HOSTS=${MONKEYSPHERE_HASH_KNOWN_HOSTS:=$HASH_KNOWN_HOSTS}
 AUTHORIZED_KEYS=${MONKEYSPHERE_AUTHORIZED_KEYS:=$AUTHORIZED_KEYS}