summaryrefslogtreecommitdiff
path: root/src/monkeysphere-server
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@phys.columbia.edu>2008-09-02 15:39:34 -0700
committerJameson Graef Rollins <jrollins@phys.columbia.edu>2008-09-02 15:39:34 -0700
commitc09ac0eb561a67c152c63c7de635040713e13b09 (patch)
tree95df88e752f585f5215f4546bf25a414301ed63a /src/monkeysphere-server
parent7f7a389eb81df2036a802a46f31eeaac39fab23f (diff)
created new VERBOSE log level, and moved most INFO stuff to that level.
Diffstat (limited to 'src/monkeysphere-server')
-rwxr-xr-xsrc/monkeysphere-server14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index ad94786..084e0d5 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -157,7 +157,7 @@ update_users() {
for uname in $unames ; do
# check all specified users exist
if ! getent passwd "$uname" >/dev/null ; then
- log info "----- unknown user '$uname' -----"
+ log verbose "----- unknown user '$uname' -----"
continue
fi
@@ -173,17 +173,17 @@ update_users() {
fi
fi
- log info "----- user: $uname -----"
+ log verbose "----- user: $uname -----"
# exit if the authorized_user_ids file is empty
if ! check_key_file_permissions "$uname" "$AUTHORIZED_USER_IDS" ; then
- log error "Improper permissions on authorized_user_ids file path."
+ log error "Improper permissions on path '$AUTHORIZED_USER_IDS'."
continue
fi
# check permissions on the authorized_keys file path
if ! check_key_file_permissions "$uname" "$RAW_AUTHORIZED_KEYS" ; then
- log error "Improper permissions on authorized_keys file path path."
+ log error "Improper permissions on path '$RAW_AUTHORIZED_KEYS'."
continue
fi
@@ -227,7 +227,7 @@ update_users() {
# add user-controlled authorized_keys file path if specified
if [ "$rawAuthorizedKeys" != '-' -a -s "$rawAuthorizedKeys" ] ; then
- log info "adding raw authorized_keys file... "
+ log verbose "adding raw authorized_keys file... "
cat "$rawAuthorizedKeys" >> "$AUTHORIZED_KEYS"
fi
@@ -346,7 +346,7 @@ EOF
EOF
)
- log info "generating server key..."
+ log verbose "generating server key..."
echo "$keyParameters" | gpg_host --batch --gen-key
# output the server fingerprint
@@ -356,7 +356,7 @@ EOF
fingerprint=$(fingerprint_server_key)
# export host ownertrust to authentication keyring
- log info "setting ultimate owner trust for server key..."
+ log verbose "setting ultimate owner trust for server key..."
echo "${fingerprint}:6:" | gpg_authentication "--import-ownertrust"
# translate the private key to ssh format, and export to a file