Merge commit 'dkg/master'

Conflicts:

	src/share/ma/setup

diff --combined src/share/ma/setup
index 216b0b903f4208293b9afc010a9c6e5812a759eb,8032023cd6fa9c789c0e8889dcab8e079fa706d6..f989db6e41c326bf74f189140a7effa1ed94c28f
--- 1/src/share/ma/setup
--- 2/src/share/ma/setup
+++ b/src/share/ma/setup
@@@ -23,7 -23,7 +23,7 @@@ setup() 
  
      # deliberately replace the config files via truncation
      # FIXME: should we be dumping to tmp files and then moving atomically?
 -    log debug "write core gpg.conf..."
 +    log debug "writing core gpg.conf..."
      cat >"${GNUPGHOME_CORE}"/gpg.conf <<EOF
  # Monkeysphere trust core GnuPG configuration
  # This file is maintained by the Monkeysphere software.
@@@ -32,19 -32,18 +32,18 @@@ no-greetin
  list-options show-uid-validity
  EOF
  
 -    log debug "write sphere gpg.conf..."
 +    log debug "writing sphere gpg.conf..."
      cat >"${GNUPGHOME_SPHERE}"/gpg.conf <<EOF
  # Monkeysphere trust sphere GnuPG configuration
  # 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
  
      # make sure the monkeysphere user owns everything in the sphere
      # gnupghome
 -    log debug "fix sphere gnupg home ownership..."
 +    log debuf "fixing sphere gnupg home ownership..."
      chown -R "$MONKEYSPHERE_USER" "${GNUPGHOME_SPHERE}"
      chgrp -R "$MONKEYSPHERE_USER" "${GNUPGHOME_SPHERE}"
  
@@@ -75,16 -74,16 +74,16 @@@
      fi
  
      # export the core key to the sphere keyring
 -    log debug "export core pub key to sphere keyring..."
 +    log debug "exporting core pub key to sphere keyring..."
      gpg_core --export | gpg_sphere --import
  
      # ensure that the authentication sphere checker has absolute ownertrust on the expected key.
 -    log debug "set ultimate owner trust on core key in gpg_sphere..."
 +    log debug "setting ultimate owner trust on core key in gpg_sphere..."
      printf "%s:6:\n" "$CORE_FPR" | gpg_sphere --import-ownertrust
      gpg_sphere --export-ownertrust | log debug
  
      # check the owner trust
 -    log debug "check gpg_sphere owner trust set properly..."
 +    log debug "checking gpg_sphere owner trust set properly..."
      local ORIG_TRUST
      if ORIG_TRUST=$(gpg_sphere --export-ownertrust | grep '^[^#]') ; then
        if [ "${CORE_FPR}:6:" != "$ORIG_TRUST" ] ; then
@@@ -97,11 -96,11 +96,11 @@@
      # 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_MODEL=$(gpg_sphere --with-colons --fixed-list-mode --list-keys \
 +    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
  }