summaryrefslogtreecommitdiff
path: root/src/share/ma/setup
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-01 21:14:22 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-01 21:14:22 -0500
commit0655d5cbf24a29da4aff7e272e82bfa258b2ceed (patch)
tree6e462df5ff450ddd67ddf3fdf686ddcbcfcd4668 /src/share/ma/setup
parent7548a859412f10e68f90ee68f330593d85b090fc (diff)
new function to export signatures from core to sphere keyrings. this
is so that the sphere does not have to read the core pubring to get the certifier ltsigs, and we can therefore keep tighter permissions on the core keyring files. updated some comments/documentation as well.
Diffstat (limited to 'src/share/ma/setup')
-rw-r--r--src/share/ma/setup6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/share/ma/setup b/src/share/ma/setup
index 672a960..229166b 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -34,12 +34,10 @@ EOF
# Edits will be overwritten.
no-greeting
primary-keyring ${GNUPGHOME_SPHERE}/pubring.gpg
-keyring ${GNUPGHOME_CORE}/pubring.gpg
-
list-options show-uid-validity
EOF
- # fingerprint of core key. this should be empty on unconfigured systems.
+ # get fingerprint of core key. this should be empty on unconfigured systems.
local CORE_FPR=$(gpg_core --with-colons --fixed-list-mode --fingerprint --list-secret-key | grep ^fpr: | cut -f10 -d: )
if [ -z "$CORE_FPR" ] ; then
@@ -57,7 +55,7 @@ EOF
# date.
< "${TMPLOC}/authkey" pem2openpgp "$CORE_UID" | gpg --import || failure "Could not import new key for Monkeysphere authentication trust core"
- gpg_core --with-colons --fixed-list-mode --fingerprint --list-secret-key
+ # get fingerprint of core key. should definitely not be empty at this point
CORE_FPR=$(gpg_core --with-colons --fixed-list-mode --fingerprint --list-secret-key | grep ^fpr: | cut -f10 -d: )
if [ -z "$CORE_FPR" ] ; then
failure "Failed to create Monkeysphere authentication trust core!"