From 58244d7d9e2d6aa2220bd2e692b2370de283cc23 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 12 Feb 2009 18:30:38 -0500
Subject: fix typo

---
 src/share/ma/setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/share/ma')

diff --git a/src/share/ma/setup b/src/share/ma/setup
index 5960ab4..533e6a1 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -44,7 +44,7 @@ EOF
 
     # make sure the monkeysphere user owns everything in the sphere
     # gnupghome
-    log debuf "fix sphere gnupg home ownership..."
+    log debug "fix sphere gnupg home ownership..."
     chown -R "$MONKEYSPHERE_USER" "${GNUPGHOME_SPHERE}"
     chgrp -R "$MONKEYSPHERE_USER" "${GNUPGHOME_SPHERE}"
 
-- 
cgit v1.2.3


From 5d6d207f7c1ad3e4545484fbab84ce25ef756ea0 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 12 Feb 2009 18:32:32 -0500
Subject: no longer require the primary-keyring for the sphere gpg.conf now
 that we use a single keyring

---
 src/share/ma/setup | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/share/ma')

diff --git a/src/share/ma/setup b/src/share/ma/setup
index 533e6a1..09c356c 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
 
-- 
cgit v1.2.3


From 472cb2447cded21c3279f314d6f9cf159d34f73f Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 12 Feb 2009 19:08:21 -0500
Subject: trust level != trust model

---
 src/share/ma/setup | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/share/ma')

diff --git a/src/share/ma/setup b/src/share/ma/setup
index 09c356c..8032023 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -96,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_MODEL=$(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
 }
-- 
cgit v1.2.3