make failures with unwritable known_hosts slightly less cryptic.
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 24 Jul 2009 15:17:31 +0000 (11:17 -0400)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Fri, 24 Jul 2009 15:17:31 +0000 (11:17 -0400)
src/share/common

index c10e71b5c3f87485ef9e64966db50a3af8948a8d..37e31a11b7f48b21920d741233c1b4edf7ba7dde 100644 (file)
@@ -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"