X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fma%2Fsetup;h=f989db6e41c326bf74f189140a7effa1ed94c28f;hb=cadb991940633888988df530819ce9465cd688ed;hp=e5109fd4ca1b7c1e6aa1482c5b3bceec2da9b2c7;hpb=65e8a49c924eac3c46c93cb4bb9be9c739a58983;p=monkeysphere.git

diff --git a/src/share/ma/setup b/src/share/ma/setup
index e5109fd..f989db6 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -38,7 +38,6 @@ EOF
 # This file is maintained by the Monkeysphere software.
 # Edits will be overwritten.
 no-greeting
-primary-keyring ${GNUPGHOME_SPHERE}/pubring.gpg
 list-options show-uid-validity
 EOF
 
@@ -97,11 +96,11 @@ EOF
     # 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 level of core key..."
-    local TRUST_LEVEL=$(gpg_sphere --with-colons --fixed-list-mode --list-keys \
+    log debug "checking trust model for authentication ..."
+    local TRUST_LEVEL=$(gpg_sphere "--with-colons --fixed-list-mode --list-keys" \
 	| head -n1 | grep "^tru:" | cut -d: -f3,6,7)
-    log debug "sphere trust level of core: $TRUST_LEVEL"
-    if [ "$TRUST_LEVEL" != '1:3:1' ] ; then
+    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."
     fi
 }