add some checks about setup to authentication

[monkeysphere.git] / src / share / ma / setup

diff --git a/src/share/ma/setup b/src/share/ma/setup
index f989db6e41c326bf74f189140a7effa1ed94c28f..f59187b8447bbfab4205e4e4bcfe2a4328f12eae 100644 (file)
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -70,7 +70,7 @@ EOF
        fi
        
     else 
-       log verbose "This system has already set up the Monkeysphere authentication trust core."
+       log verbose "Monkeysphere authentication trust core already exists."
     fi
 
     # export the core key to the sphere keyring
@@ -91,16 +91,18 @@ EOF
        fi
     else
        failure "Could not get monkeysphere-authentication trust guidelines."
+       # FIXME: what does this mean?  should we suggest how to fix?
     fi
 
     # ensure that we're using the extended trust model (1), and that
     # our preferences are reasonable (i.e. 3 marginal OR 1 fully
     # trusted certifications are sufficient to grant full validity.
     log debug "checking trust model for authentication ..."
-    local TRUST_LEVEL=$(gpg_sphere "--with-colons --fixed-list-mode --list-keys" \
+    local TRUST_MODEL=$(gpg_sphere "--with-colons --fixed-list-mode --list-keys" \
        | head -n1 | grep "^tru:" | cut -d: -f3,6,7)
     log debug "sphere trust model: $TRUST_MODEL"
     if [ "$TRUST_MODEL" != '1:3:1' ] ; then
        failure "monkeysphere-authentication does not have the expected trust model settings."
+       # FIXME: what does this mean?  should we suggest how to fix?
     fi
 }