summaryrefslogtreecommitdiff
path: root/src/monkeysphere-server
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-07-27 22:24:31 -0700
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-07-27 22:24:31 -0700
commitacb3000647031defca23b38d85e48954085a4d2a (patch)
tree4592d539bae8d0d1cf6dea44e04e3049318acebb /src/monkeysphere-server
parente2cb90d3bbb4246a4fa27d49f55fd02c32336f47 (diff)
Don't fail when authorized_user_ids or known_hosts files are not found.
Diffstat (limited to 'src/monkeysphere-server')
-rwxr-xr-xsrc/monkeysphere-server9
1 files changed, 5 insertions, 4 deletions
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