From: Thomas Roessler <roessler@does-not-exist.org>
Date: Thu, 19 Dec 2002 11:43:56 +0000 (+0000)
Subject: Don't bother the user with weak keys when there's a strong one.
X-Git-Tag: mutt-1-5-4-rel~118
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fafc62ef5d1beaf51647cdfba51d3aeae3fd58c1;p=mutt

Don't bother the user with weak keys when there's a strong one.
Experimental, based on discussions on mutt-dev.
---

diff --git a/pgpkey.c b/pgpkey.c
index 3cff85c1..060cf188 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.
        */