created new VERBOSE log level, and moved most INFO stuff to that level.

diff --git a/src/common b/src/common
index 3b3b7a51f3b8daac02ddf018d1ae22ea2fa1c3aa..c70ba64593994959667bdaf23e1bfb0b79ab5db0 100644 (file)
--- a/src/common
+++ b/src/common
@@ -42,7 +42,7 @@ log() {
     # list in decreasing verbosity (all caps).
     # separate with $IFS explicitly, since we do some fancy footwork
     # elsewhere.
-    alllevels="DEBUG${IFS}INFO${IFS}ERROR"
+    alllevels="DEBUG${IFS}VERBOSE${IFS}INFO${IFS}ERROR"
 
     # translate lowers to uppers in global log level
     LOG_LEVEL=$(echo "$LOG_LEVEL" | tr "[:lower:]" "[:upper:]")
@@ -413,7 +413,7 @@ gpg_fetch_userid() {
 
     userID="$1"
 
-    log info " checking keyserver $KEYSERVER... "
+    log verbose " checking keyserver $KEYSERVER... "
     echo 1,2,3,4,5 | \
        gpg --quiet --batch --with-colons \
        --command-fd 0 --keyserver "$KEYSERVER" \
@@ -485,7 +485,7 @@ process_user_id() {
 
     # if the gpg query return code is not 0, return 1
     if [ "$?" -ne 0 ] ; then
-        log info " no primary keys found."
+        log verbose " no primary keys found."
         return 1
     fi
 
@@ -502,7 +502,7 @@ process_user_id() {
                lastKeyOK=
                fingerprint=
 
-               log info " primary key found: $keyid"
+               log verbose " primary key found: $keyid"
 
                # if overall key is not valid, skip
                if [ "$validity" != 'u' -a "$validity" != 'f' ] ; then
@@ -551,7 +551,7 @@ process_user_id() {
                # output a line for the primary key
                # 0 = ok, 1 = bad
                if [ "$keyOK" -a "$uidOK" -a "$lastKeyOK" ] ; then
-                   log info "  * acceptable primary key."
+                   log verbose "  * acceptable primary key."
                    if [ -z "$sshKey" ] ; then
                        log error "    ! primary key could not be translated (not RSA or DSA?)."
                    else
@@ -607,7 +607,7 @@ process_user_id() {
                # output a line for the sub key
                # 0 = ok, 1 = bad
                if [ "$keyOK" -a "$uidOK" -a "$lastKeyOK" ] ; then
-                   log info "  * acceptable sub key."
+                   log verbose "  * acceptable sub key."
                    if [ -z "$sshKey" ] ; then
                        log error "    ! sub key could not be translated (not RSA or DSA?)."
                    else
@@ -642,7 +642,7 @@ process_host_known_hosts() {
     host="$1"
     userID="ssh://${host}"
 
-    log info "processing: $host"
+    log verbose "processing: $host"
 
     nKeys=0
     nKeysOK=0
@@ -743,7 +743,7 @@ update_known_hosts() {
 
     # note if the known_hosts file was updated
     if [ "$(file_hash "$KNOWN_HOSTS")" != "$fileCheck" ] ; then
-       log info "known_hosts file updated."
+       log verbose "known_hosts file updated."
     fi
 
     # if an acceptable host was found, return 0
@@ -766,7 +766,7 @@ update_known_hosts() {
 process_known_hosts() {
     local hosts
 
-    log info "processing known_hosts file..."
+    log verbose "processing known_hosts file..."
 
     hosts=$(meat "$KNOWN_HOSTS" | cut -d ' ' -f 1 | grep -v '^|.*$' | tr , ' ' | tr '\n' ' ')
 
@@ -791,7 +791,7 @@ process_uid_authorized_keys() {
 
     userID="$1"
 
-    log info "processing: $userID"
+    log verbose "processing: $userID"
 
     nKeys=0
     nKeysOK=0
@@ -886,7 +886,7 @@ update_authorized_keys() {
 
     # note if the authorized_keys file was updated
     if [ "$(file_hash "$AUTHORIZED_KEYS")" != "$fileCheck" ] ; then
-       log info "authorized_keys file updated."
+       log verbose "authorized_keys file updated."
     fi
 
     # if an acceptable id was found, return 0
@@ -913,7 +913,7 @@ process_authorized_user_ids() {
 
     authorizedUserIDs="$1"
 
-    log info "processing authorized_user_ids file..."
+    log verbose "processing authorized_user_ids file..."
 
     if ! meat "$authorizedUserIDs" > /dev/null ; then
        log error "no user IDs to process."

diff --git a/src/monkeysphere b/src/monkeysphere
index b0003fc3c71c137fd4556c97bc475ff57aa50437..92beafd64e5a73d3e946659ba7b67ca90b179924 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -146,7 +146,7 @@ save
 EOF
 )
 
-    log info "generating subkey..."
+    log verbose "generating subkey..."
     fifoDir=$(mktemp -d)
     (umask 077 && mkfifo "$fifoDir/pass")
     echo "$editCommands" | gpg --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --edit-key "$keyID" &
@@ -155,7 +155,7 @@ EOF
 
     rm -rf "$fifoDir"
     wait
-    log info "done."
+    log verbose "done."
 }
 
 function subkey_to_ssh_agent() {

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index ad9478644619fb170a61ad23d1e5306c5227b89c..084e0d51a19f03f4f3e9e1e37277427e0a18f421 100755 (executable)
--- 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