summaryrefslogtreecommitdiff
path: root/src/share/ma
diff options
context:
space:
mode:
Diffstat (limited to 'src/share/ma')
-rw-r--r--src/share/ma/add_certifier8
-rw-r--r--src/share/ma/remove_certifier7
2 files changed, 6 insertions, 9 deletions
diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index 28c229a..54ea673 100644
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -36,8 +36,6 @@ local fingerprint
local ltsignCommand
local trustval
-PROMPT=true
-
# get options
while true ; do
case "$1" in
@@ -53,10 +51,6 @@ while true ; do
depth="$2"
shift 2
;;
- -y)
- PROMPT=false
- shift 1
- ;;
*)
if [ "$(echo "$1" | cut -c 1)" = '-' ] ; then
failure "Unknown option '$1'.
@@ -114,7 +108,7 @@ fi
log info "key found:"
gpg_sphere "--fingerprint 0x${fingerprint}!"
-if [ "$PROMPT" = true ] ; then
+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
diff --git a/src/share/ma/remove_certifier b/src/share/ma/remove_certifier
index 4e56264..8271ae0 100644
--- a/src/share/ma/remove_certifier
+++ b/src/share/ma/remove_certifier
@@ -23,13 +23,16 @@ if [ -z "$keyID" ] ; then
failure "You must specify the key ID of a key to remove."
fi
-if gpg_sphere "--list-key --fingerprint 0x${keyID}!" ; then
+# FIXME: should we be doing a fancier list_certifier output here?
+gpg_core --list-key --fingerprint "0x${keyID}!" || failure
+
+if [ "$PROMPT" = "true" ] ; then
read -p "Really remove above listed identity certifier? (y/N) " OK; OK=${OK:-N}
if [ "${OK/y/Y}" != 'Y' ] ; then
failure "Identity certifier not removed."
fi
else
- failure
+ log debug "certifier removed without prompting."
fi
# delete the requested key from the sphere keyring