projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6ac6545
)
trust level != trust model
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Fri, 13 Feb 2009 00:08:21 +0000
(19:08 -0500)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Fri, 13 Feb 2009 00:08:21 +0000
(19:08 -0500)
src/share/ma/setup
patch
|
blob
|
history
diff --git
a/src/share/ma/setup
b/src/share/ma/setup
index 09c356c85bb3804c14ee8ca9fe451a44325dbe8d..8032023cd6fa9c789c0e8889dcab8e079fa706d6 100644
(file)
--- a/
src/share/ma/setup
+++ b/
src/share/ma/setup
@@
-96,11
+96,11
@@
EOF
# 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.
# 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
..."
- local TRUST_
LEV
EL=$(gpg_sphere --with-colons --fixed-list-mode --list-keys \
+ log debug "checking trust
model for authentication
..."
+ local TRUST_
MOD
EL=$(gpg_sphere --with-colons --fixed-list-mode --list-keys \
| head -n1 | grep "^tru:" | cut -d: -f3,6,7)
| head -n1 | grep "^tru:" | cut -d: -f3,6,7)
- log debug "sphere trust
level of core: $TRUST_LEV
EL"
- if [ "$TRUST_
LEV
EL" != '1:3:1' ] ; then
+ log debug "sphere trust
model: $TRUST_MOD
EL"
+ if [ "$TRUST_
MOD
EL" != '1:3:1' ] ; then
failure "monkeysphere-authentication does not have the expected trust model settings."
fi
}
failure "monkeysphere-authentication does not have the expected trust model settings."
fi
}