From 7e3eb624f52da8bef1e55f5eb44fa464ad585ca8 Mon Sep 17 00:00:00 2001 From: Joseph Herlant Date: Tue, 22 Nov 2016 10:43:08 -0800 Subject: [PATCH] Remove the key from the keyring when removing an admin (#173) Thanks for the submission! --- bin/blackbox_removeadmin | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/blackbox_removeadmin b/bin/blackbox_removeadmin index 6249721..9034977 100755 --- a/bin/blackbox_removeadmin +++ b/bin/blackbox_removeadmin @@ -20,8 +20,15 @@ KEYNAME="$1" # Remove the email address from the BB_ADMINS file. remove_line "$BB_ADMINS" "$KEYNAME" + +# remove the admin key from the pubring +$GPG --no-permission-warning --homedir="$KEYRINGDIR" --delete-key "$KEYNAME" +pubring_path=$(get_pubring_path) +vcs_add "$pubring_path" "$KEYRINGDIR/trustdb.gpg" "$BB_ADMINS" + + # Make a suggestion: echo echo echo 'NEXT STEP: Check these into the repo. Probably with a command like...' -echo $VCS_TYPE commit -m\'REMOVED ADMIN: $KEYNAME\' "$BLACKBOXDATA/$BB_ADMINS_FILE" +echo $VCS_TYPE commit -m\'REMOVED ADMIN: $KEYNAME\' "$BLACKBOXDATA/trustdb.gpg" "$BLACKBOXDATA/$BB_ADMINS_FILE"