aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2025-05-13 13:46:41 +0000
committerWerner Koch <[email protected]>2025-05-13 13:46:41 +0000
commitd5a4a2dc890ea21e371662872fcfd43ed9d16142 (patch)
tree65ac59fcf88f8ba02e3e40ecdb0feca19a457555
parentgpgsm: Just print a note for an empty subject during import. (diff)
downloadgnupg-d5a4a2dc890ea21e371662872fcfd43ed9d16142.tar.gz
gnupg-d5a4a2dc890ea21e371662872fcfd43ed9d16142.zip
gpg: Make combination of show-only-fpr-mbox and show-unusable-uid work.
* g10/keylist.c (list_keyblock_simple): Take care of show-unusable-uids. -- This allows to upload revoked keys to a WKD. Suggested-by: Uwe Kleine-König
-rw-r--r--g10/keylist.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/keylist.c b/g10/keylist.c
index 8d4617f85..d1e9a90ff 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -1825,7 +1825,8 @@ list_keyblock_simple (ctrl_t ctrl, kbnode_t keyblock)
if (uid->attrib_data)
continue;
- if (uid->flags.expired || uid->flags.revoked)
+ if ((uid->flags.expired || uid->flags.revoked)
+ && !(opt.list_options & LIST_SHOW_UNUSABLE_UIDS))
continue;
mbox = mailbox_from_userid (uid->name, 0);