fix reference to MONKEYSPHER_USER in ma/setup

[monkeysphere.git] / src / share / ma / setup

diff --git a/src/share/ma/setup b/src/share/ma/setup
index 422cfd3efcc58e009bb10b2370e59ee5219fbc16..0cd92e0d8bc87134df43ec1d84dc5247805eebe2 100644 (file)
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -40,10 +40,10 @@ primary-keyring ${GNUPGHOME_SPHERE}/pubring.gpg
 list-options show-uid-validity
 EOF
 
-    # make sure the monkeysphere user owns everything in th sphere
+    # make sure the monkeysphere user owns everything in the sphere
     # gnupghome
-    chown -R "$MONKEYPSHER_USER" "${GNUPGHOME_SPHERE}"
-    chgrp -R "$MONKEYPSHER_USER" "${GNUPGHOME_SPHERE}"
+    chown -R "$MONKEYPSHERE_USER" "${GNUPGHOME_SPHERE}"
+    chgrp -R "$MONKEYPSHERE_USER" "${GNUPGHOME_SPHERE}"
 
     # 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: )
@@ -53,17 +53,8 @@ EOF
 
        local CORE_UID=$(printf "Monkeysphere authentication trust core UID (random string: %s)" $(head -c21 </dev/urandom | base64))
     
-       local TMPLOC=$(mktemp -d "${MATMPDIR}"/tmp.XXXXXXXXXX) || failure "Could not create temporary directory!"
-
-       # generate the key with ssh-keygen...
-       log debug "generating ssh key ($CORE_KEYLENGTH bits)..."
-       ssh-keygen -q -b "$CORE_KEYLENGTH" -t rsa -N '' -f "${TMPLOC}/authkey" || failure "Could not generate new key for Monkeysphere authentication trust core"
-       # and then translate to openpgp encoding and import
-       # FIXME: pem2openpgp currently sets the A flag and a short
-       # expiration date.  We should set the C flag and no expiration
-       # date.
-       log debug "converting ssh key to openpgp key and importing into core..."
-       < "${TMPLOC}/authkey" pem2openpgp "$CORE_UID" | gpg_core --import || failure "Could not import new key for Monkeysphere authentication trust core"
+       log debug "generating monkeysphere authentication trust core key ($CORE_KEYLENGTH bits)..."
+       PEM2OPENPGP_USAGE_FLAGS=certify PEM2OPENPGP_NEWKEY=$CORE_KEYLENGTH pem2openpgp "$CORE_UID" | gpg_core --import || failure "Could not import new key for Monkeysphere authentication trust core"
 
        # get fingerprint of core key.  should definitely not be empty at this point
        log debug "get core key fingerprint..."
@@ -94,7 +85,10 @@ EOF
     # our preferences are reasonable (i.e. 3 marginal OR 1 fully
     # trusted certifications are sufficient to grant full validity.
     log debug "check trust level of core key..."
-    if [ "1:3:1" != $(gpg_sphere --with-colons --fixed-list-mode --list-keys | head -n1 | grep ^tru: cut -f3,6,7 -d:) ] ; then
+    local TRUST_LEVEL=$(gpg_sphere --with-colons --fixed-list-mode --list-keys \
+       | head -n1 | grep "^tru:" | cut -d: -f3,6,7)
+    log debug "trust level: $TRUST_LEVEL"
+    if [ "$TRUST_LEVEL" != '1:3:1' ] ; then
        failure "monkeysphere-authentication does not have the expected trust model settings."
     fi
 }