From c32302172e3533b2170329206ff011d6e3a26a49 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Mon, 16 Jun 2008 14:43:40 -0400
Subject: Fix bug in configuration handling for HASH_KNOWN_HOSTS and
 USER_CONTROLLED_AUTHORIZED_KEYS

---
 src/common | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/common')

diff --git a/src/common b/src/common
index 471e75a..c0a9030 100644
--- a/src/common
+++ b/src/common
@@ -275,7 +275,7 @@ process_user_id() {
 		gpg2known_hosts "$keyID" "$userID" >> \
 		    "$cacheDir"/"$userIDHash"."$pubKeyID"
 		# hash the cache file if specified
-		if [ "$HASH_KNOWN_HOSTS" ] ; then
+		if [ "$HASH_KNOWN_HOSTS" = "true" ] ; then
 		    ssh-keygen -H -f "$cacheDir"/"$userIDHash"."$pubKeyID" > /dev/null 2>&1
 		    rm "$cacheDir"/"$userIDHash"."$pubKeyID".old
 		fi
@@ -408,7 +408,7 @@ update_authorized_keys() {
     else
 	log "no gpg keys to add."
     fi
-    if [ "$userAuthorizedKeys" -a -s "$userAuthorizedKeys" ] ; then
+    if [ "$userAuthorizedKeys" != "-" -a -s "$userAuthorizedKeys" ] ; then
 	log -n "adding user authorized_keys file... "
 	cat "$userAuthorizedKeys" >> "$msAuthorizedKeys"
 	echo "done."
-- 
cgit v1.2.3