From d5a4a2dc890ea21e371662872fcfd43ed9d16142 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 13 May 2025 15:46:41 +0200 Subject: [PATCH] gpg: Make combination of show-only-fpr-mbox and show-unusable-uid work. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- g10/keylist.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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);