From 658b20d919d3498111efd5a6e901d3ab19d8e669 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 11 Nov 2010 17:29:27 -0500
Subject: universalize and consolidate on --fixed-list-mode

---
 src/share/ma/diagnostics     | 2 +-
 src/share/ma/list_certifiers | 2 +-
 src/share/ma/setup           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/share/ma')

diff --git a/src/share/ma/diagnostics b/src/share/ma/diagnostics
index 8eca586..fadb70d 100644
--- a/src/share/ma/diagnostics
+++ b/src/share/ma/diagnostics
@@ -51,7 +51,7 @@ fi
 # sshd_config lives?
 sshd_config=/etc/ssh/sshd_config
 
-seckey=$(gpg_core --list-secret-keys --fingerprint --with-colons --fixed-list-mode)
+seckey=$(gpg_core --list-secret-keys --fingerprint --with-colons)
 keysfound=$(echo "$seckey" | grep -c ^sec:)
 curdate=$(date +%s)
 # warn when anything is 2 months away from expiration
diff --git a/src/share/ma/list_certifiers b/src/share/ma/list_certifiers
index 56d52da..0a8f4df 100644
--- a/src/share/ma/list_certifiers
+++ b/src/share/ma/list_certifiers
@@ -38,7 +38,7 @@ authgrip=$(core_fingerprint | cut -b 25-40)
 # fingerprint, the trust depth, the trust level (60 == marginal, 120
 # == full), and the domain regex (if any):
 
-gpg_sphere --fingerprint --with-colons --fixed-list-mode --check-sigs | \
+gpg_sphere --fingerprint --with-colons --check-sigs | \
     cut -f 1,2,5,8,9,10 -d: | \
     egrep '^(fpr:::::|uat:|uid:|sig:!:'"$authgrip"':[[:digit:]]+ [[:digit:]]+:)' | \
     while IFS=: read -r type validity grip trustparams trustdomain fpr ; do
diff --git a/src/share/ma/setup b/src/share/ma/setup
index 5cc3aab..9a047aa 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -110,7 +110,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" 2>/dev/null \
+    local TRUST_MODEL=$(gpg_sphere "--with-colons --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
-- 
cgit v1.2.3