From f14d029e1588eb74ce65c17d336c5c903530d5a8 Mon Sep 17 00:00:00 2001 From: Thomas Roessler Date: Thu, 19 Dec 2002 11:43:56 +0000 Subject: [PATCH] Don't bother the user with weak keys when there's a strong one. Experimental, based on discussions on mutt-dev. --- pgpkey.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pgpkey.c b/pgpkey.c index 3cff85c1b..060cf188e 100644 --- a/pgpkey.c +++ b/pgpkey.c @@ -910,13 +910,11 @@ pgp_key_t *pgp_getkeybyaddr (ADDRESS * a, short abilities, pgp_ring_t keyring) if (matches) { - if (the_valid_key && !multi && !weak - && !(invalid && option (OPTPGPSHOWUNUSABLE))) - { - /* - * There was precisely one strong match on a valid ID, there - * were no valid keys with weak matches, and we aren't - * interested in seeing invalid keys. + if (the_valid_key && !multi /* && !weak + && !(invalid && option (OPTPGPSHOWUNUSABLE)) */) + { + /* + * There was precisely one strong match on a valid ID. * * Proceed without asking the user. */ -- 2.40.0