From acb3000647031defca23b38d85e48954085a4d2a Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Sun, 27 Jul 2008 22:24:31 -0700 Subject: Don't fail when authorized_user_ids or known_hosts files are not found. --- src/monkeysphere-server | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/monkeysphere-server') diff --git a/src/monkeysphere-server b/src/monkeysphere-server index 19b457f..ce80059 100755 --- a/src/monkeysphere-server +++ b/src/monkeysphere-server @@ -143,13 +143,15 @@ update_users() { log "----- user: $uname -----" + # exit if the authorized_user_ids file is empty if ! check_key_file_permissions "$uname" "$AUTHORIZED_USER_IDS" ; then - log "Improper permissions on authorized_user_ids file." + log "Improper permissions on authorized_user_ids file path." continue fi + # check permissions on the authorized_keys file path if ! check_key_file_permissions "$uname" "$RAW_AUTHORIZED_KEYS" ; then - log "Improper permissions on authorized_keys file." + log "Improper permissions on authorized_keys file path path." continue fi @@ -206,8 +208,7 @@ update_users() { chgrp $(getent passwd "$uname" | cut -f4 -d:) "$AUTHORIZED_KEYS" chmod g+r "$AUTHORIZED_KEYS" - # if the resulting authorized_keys file is not empty, move - # it into place + # move the resulting authorized_keys file into place mv -f "$AUTHORIZED_KEYS" "${VARLIB}/authorized_keys/${uname}" # destroy temporary directory -- cgit v1.2.3