diff options
author | Matt Goins <mjgoins@openflows.com> | 2009-01-31 20:34:34 -0500 |
---|---|---|
committer | Matt Goins <mjgoins@openflows.com> | 2009-01-31 20:34:34 -0500 |
commit | 478cc34eee374166aae51f8598aa392e1fbfdde6 (patch) | |
tree | 0d4701431f004cacd52995679e7fd28e2af9baa9 /src/subcommands/ma/remove-certifier | |
parent | 334f15b617fd89162336697e73c7f5645f0d1d3d (diff) | |
parent | 2b5cd0f910f28a601bcecfe68cdfc1ffd9b1362c (diff) |
Merge commit 'jrollins/master'
Diffstat (limited to 'src/subcommands/ma/remove-certifier')
-rw-r--r-- | src/subcommands/ma/remove-certifier | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/subcommands/ma/remove-certifier b/src/subcommands/ma/remove-certifier index 59d3f0c..560281d 100644 --- a/src/subcommands/ma/remove-certifier +++ b/src/subcommands/ma/remove-certifier @@ -23,7 +23,7 @@ if [ -z "$keyID" ] ; then failure "You must specify the key ID of a key to remove." fi -if gpg_authentication "--no-options --list-options show-uid-validity --keyring ${GNUPGHOME_AUTHENTICATION}/pubring.gpg --list-key 0x${keyID}!" ; then +if gpg_sphere "--no-options --list-options show-uid-validity --keyring ${GNUPGHOME_AUTHENTICATION}/pubring.gpg --list-key 0x${keyID}!" ; 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." @@ -33,12 +33,12 @@ else fi # delete the requested key -if gpg_authentication "--delete-key --batch --yes 0x${keyID}!" ; then +if gpg_sphere "--delete-key --batch --yes 0x${keyID}!" ; then # delete key from host keyring as well - gpg_host --delete-key --batch --yes "0x${keyID}!" + gpg_core --delete-key --batch --yes "0x${keyID}!" # update the trustdb for the authentication keyring - gpg_authentication "--check-trustdb" + gpg_sphere "--check-trustdb" echo echo "Identity certifier removed." |