summaryrefslogtreecommitdiff
path: root/src/share
diff options
context:
space:
mode:
authorJameson Graef Rollins <jrollins@finestructure.net>2009-02-12 13:30:57 -0500
committerJameson Graef Rollins <jrollins@finestructure.net>2009-02-12 13:32:14 -0500
commit904a1d633f71836b9e8a11f1656d535c3d7e0897 (patch)
tree7d2747f03f56f7bd7ac3a447f9199d82194eb3a6 /src/share
parent0cc9a8f041a9b9b97e7f5f24f71a92961e54c4f2 (diff)
add ability to supress confirmation prompt in ma/add_certifier
fix some logging output
Diffstat (limited to 'src/share')
-rw-r--r--src/share/ma/add_certifier28
-rw-r--r--src/share/ma/remove_certifier3
-rw-r--r--src/share/mh/add_revoker4
3 files changed, 24 insertions, 11 deletions
diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index e9731cc..2e53455 100644
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -36,6 +36,8 @@ local fingerprint
local ltsignCommand
local trustval
+PROMPT=true
+
# get options
while true ; do
case "$1" in
@@ -51,6 +53,10 @@ while true ; do
depth="$2"
shift 2
;;
+ -y)
+ PROMPT=false
+ shift 1
+ ;;
*)
if [ "$(echo "$1" | cut -c 1)" = '-' ] ; then
failure "Unknown option '$1'.
@@ -90,26 +96,32 @@ if [ -f "$keyID" ] ; then
fi
else
# get the key from the key server
+ log debug "retrieving key from keyserver..."
gpg_sphere "--keyserver $KEYSERVER --recv-key '0x${keyID}!'" || failure "Could not receive a key with this ID from the '$KEYSERVER' keyserver."
fi
export keyID
# get the full fingerprint of a key ID
-fingerprint=$(gpg_sphere "--list-key --with-colons --with-fingerprint 0x${keyID}!" | \
- grep '^fpr:' | grep "$keyID" | cut -d: -f10)
+log debug "getting fingerprint of certifier key..."
+fingerprint=$(gpg_sphere "--list-key --with-colons --with-fingerprint 0x${keyID}!" \
+ | grep '^fpr:' | grep "$keyID" | cut -d: -f10)
if [ -z "$fingerprint" ] ; then
failure "Key '$keyID' not found."
fi
-log info -e "\nkey found:"
+log info "key found:"
gpg_sphere "--fingerprint 0x${fingerprint}!"
-echo "Are you sure you want to add the above key as a"
-read -p "certifier of users on this system? (y/N) " OK; OK=${OK:-N}
-if [ "${OK/y/Y}" != 'Y' ] ; then
- failure "Identity certifier not added."
+if [ "$PROMPT" = true ] ; then
+ echo "Are you sure you want to add the above key as a"
+ read -p "certifier of users on this system? (y/N) " OK; OK=${OK:-N}
+ if [ "${OK/y/Y}" != 'Y' ] ; then
+ failure "Identity certifier not added."
+ fi
+else
+ log debug "adding key without prompting."
fi
# export the key to the core keyring so that the core can sign the
@@ -151,7 +163,7 @@ if echo "$ltsignCommand" | \
# update the sphere trustdb
gpg_sphere "--check-trustdb"
- log info -e "\nIdentity certifier added."
+ log info "Identity certifier added."
else
failure "Problem adding identify certifier."
fi
diff --git a/src/share/ma/remove_certifier b/src/share/ma/remove_certifier
index 1164162..c7aabea 100644
--- a/src/share/ma/remove_certifier
+++ b/src/share/ma/remove_certifier
@@ -41,7 +41,8 @@ if gpg_sphere "--delete-key --batch --yes 0x${keyID}!" ; then
# update the trustdb for the authentication keyring
gpg_sphere "--check-trustdb"
- log info -e "\nIdentity certifier removed."
+ log info ""
+ log info "Identity certifier removed."
else
failure "Problem removing identity certifier."
fi
diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index 39dfaca..8d160a8 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -74,7 +74,7 @@ if [ -z "$fingerprint" ] ; then
failure "Key '$keyID' not found."
fi
-log info -e "\nkey found:"
+log info "key found:"
gpg_host --fingerprint "0x${fingerprint}!"
echo "Are you sure you want to add the above key as a"
@@ -98,7 +98,7 @@ failure "not implemented yet!"
if echo "$addrevokerCommand" | \
gpg_core_edit ; then
- log info -e "\nRevoker added."
+ log info "Revoker added."
else
failure "Problem adding revoker."
fi