summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-16 14:43:40 -0400
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-06-16 14:43:40 -0400
commitc32302172e3533b2170329206ff011d6e3a26a49 (patch)
tree124b232f658670adc581c9358821411f1b51616f /src/common
parentb6983d7cb86f450ebd7fafcb254011fd7099c246 (diff)
Fix bug in configuration handling for HASH_KNOWN_HOSTS and
USER_CONTROLLED_AUTHORIZED_KEYS
Diffstat (limited to 'src/common')
-rw-r--r--src/common4
1 files changed, 2 insertions, 2 deletions
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."