From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 24 Jul 2009 15:17:31 +0000 (-0400)
Subject: make failures with unwritable known_hosts slightly less cryptic.
X-Git-Tag: monkeysphere_0.26~23^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b4296a152643b5c759beb7c2604812417cad0928;p=monkeysphere.git

make failures with unwritable known_hosts slightly less cryptic.
---

diff --git a/src/share/common b/src/share/common
index c10e71b..37e31a1 100644
--- a/src/share/common
+++ b/src/share/common
@@ -897,12 +897,12 @@ update_known_hosts() {
     # touch the known_hosts file so that the file permission check
     # below won't fail upon not finding the file
     if [ ! -f "$KNOWN_HOSTS" ]; then
-	[ -d $(dirname "$KNOWN_HOSTS") ] || mkdir -m 0700 $(dirname "$KNOWN_HOSTS")
-	touch "$KNOWN_HOSTS"
+	[ -d $(dirname "$KNOWN_HOSTS") ] || mkdir -m 0700 $(dirname "$KNOWN_HOSTS") || failure "Could not create path to known_hosts file '$KNOWN_HOSTS'"
+	touch "$KNOWN_HOSTS" || failure "Unable to create known_hosts file '$KNOWN_HOSTS'"
     fi
 
     # check permissions on the known_hosts file path
-    check_key_file_permissions $(whoami) "$KNOWN_HOSTS" || failure
+    check_key_file_permissions $(whoami) "$KNOWN_HOSTS" || failure "Bad permissions governing known_hosts file '$KNOWN_HOSTS'"
 
     # create a lockfile on known_hosts:
     lock create "$KNOWN_HOSTS"