summaryrefslogtreecommitdiff
path: root/src/share/ma/setup
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-03-02 17:42:33 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2009-03-02 17:42:33 -0500
commit964d1c805c5866ea7f4a2c38808ccc3a5db490f5 (patch)
tree635555fd247da0768f71f987671d39dcf1285fad /src/share/ma/setup
parentf422913545040510e4ff4a794a00c5af8986cfc1 (diff)
quieting down the transition script (and m-a setup).
Diffstat (limited to 'src/share/ma/setup')
-rw-r--r--src/share/ma/setup4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/share/ma/setup b/src/share/ma/setup
index f991050..b453f3c 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -82,7 +82,7 @@ EOF
# ensure that the authentication sphere checker has absolute ownertrust on the expected key.
log debug "setting ultimate owner trust on core key in gpg_sphere..."
- printf "%s:6:\n" "$CORE_FPR" | gpg_sphere "--import-ownertrust"
+ printf "%s:6:\n" "$CORE_FPR" | gpg_sphere "--import-ownertrust" 2>&1 | log verbose
gpg_sphere "--export-ownertrust" 2>&1 | log debug
# check the owner trust
@@ -101,7 +101,7 @@ EOF
# our preferences are reasonable (i.e. 3 marginal OR 1 fully
# trusted certifications are sufficient to grant full validity.
log debug "checking trust model for authentication ..."
- local TRUST_MODEL=$(gpg_sphere "--with-colons --fixed-list-mode --list-keys" \
+ local TRUST_MODEL=$(gpg_sphere "--with-colons --fixed-list-mode --list-keys" 2>/dev/null \
| head -n1 | grep "^tru:" | cut -d: -f3,6,7)
log debug "sphere trust model: $TRUST_MODEL"
if [ "$TRUST_MODEL" != '1:3:1' ] ; then