Merge commit 'dkg/master'

Conflicts:

	src/share/ma/setup

2 files changed, 7 insertions, 5 deletions

diff --git a/src/share/ma/setup b/src/share/ma/setup
index 216b0b9..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..."
+    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
 }
diff --git a/tests/common b/tests/common
index adc96a2..0f90500 100644
--- a/tests/common
+++ b/tests/common
@@ -3,7 +3,10 @@
 failed_cleanup() {
     # FIXME: can we be more verbose here?
     echo 'FAILED!'
-    read -p "press enter to cleanup and remove tmp:"
+    read -p "press enter to cleanup and remove tmp (or type bash for a subshell to examine): " XX
+    if [ "$XX" = bash ] ; then
+	bash
+    fi
 
     cleanup
 }