From 0cc9a8f041a9b9b97e7f5f24f71a92961e54c4f2 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Thu, 12 Feb 2009 13:29:30 -0500 Subject: [PATCH] clean up how trust level was check in ma/setup, with some debug output --- src/share/ma/setup | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/share/ma/setup b/src/share/ma/setup index 034f047..894db84 100644 --- a/src/share/ma/setup +++ b/src/share/ma/setup @@ -85,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 } -- 2.25.1