From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Fri, 24 Jul 2009 15:08:35 +0000 (-0400)
Subject: Merge commit 'dkg/master'
X-Git-Tag: monkeysphere_0.26~24
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=478dfc8331177d7397a8430e5d04bffcd601ab2b;hp=c600e3474acfee2e4eff1f000a1131c0f5905d08

Merge commit 'dkg/master'
---

diff --git a/src/share/common b/src/share/common
index 8e2232d..c10e71b 100644
--- a/src/share/common
+++ b/src/share/common
@@ -896,7 +896,10 @@ update_known_hosts() {
 
     # touch the known_hosts file so that the file permission check
     # below won't fail upon not finding the file
-    (umask 0022 && touch "$KNOWN_HOSTS")
+    if [ ! -f "$KNOWN_HOSTS" ]; then
+	[ -d $(dirname "$KNOWN_HOSTS") ] || mkdir -m 0700 $(dirname "$KNOWN_HOSTS")
+	touch "$KNOWN_HOSTS"
+    fi
 
     # check permissions on the known_hosts file path
     check_key_file_permissions $(whoami) "$KNOWN_HOSTS" || failure