summaryrefslogtreecommitdiff
path: root/src/share
diff options
context:
space:
mode:
Diffstat (limited to 'src/share')
-rw-r--r--src/share/common4
-rw-r--r--src/share/ma/list_certifiers2
-rw-r--r--src/share/ma/setup1
3 files changed, 6 insertions, 1 deletions
diff --git a/src/share/common b/src/share/common
index 37f5305..cabc378 100644
--- a/src/share/common
+++ b/src/share/common
@@ -581,6 +581,10 @@ gpg_fetch_userid() {
--search ="$userID" &>/dev/null
returnCode="$?"
+ if [ "$returnCode" != 0 ] ; then
+ log error "Failure ($returnCode) searching keyserver $KEYSERVER for user id '$userID'"
+ fi
+
return "$returnCode"
}
diff --git a/src/share/ma/list_certifiers b/src/share/ma/list_certifiers
index 38a3222..789eb9d 100644
--- a/src/share/ma/list_certifiers
+++ b/src/share/ma/list_certifiers
@@ -4,7 +4,7 @@
# Monkeysphere authentication list-certifiers subcommand
#
# The monkeysphere scripts are written by:
-# Jameson Rollins <jrollins@fifthhorseman.net>
+# Jameson Rollins <jrollins@finestructure.net>
# Jamie McClelland <jm@mayfirst.org>
# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
#
diff --git a/src/share/ma/setup b/src/share/ma/setup
index 6c75fef..f965487 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -43,6 +43,7 @@ EOF
# Edits will be overwritten.
no-greeting
list-options show-uid-validity
+keyserver-options ca-cert-file=${SYSCONFIGDIR}/monkeysphere-authentication-x509-anchors.crt
EOF
# make sure the monkeysphere user owns everything in the sphere