Remove dead code. Thanks to Ingo Schwarze.

diff --git a/ChangeLog b/ChangeLog
index 75723560730f72245fcf3b5734c4b8bdd4302d39..faa3ef4b5c9558e2c9caf16228491d759b342866 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,21 @@
-2009-01-04 14:28 -0800  Brendan Cully  <brendan@kublai.com>  (04ab9048ef99)
+2009-01-04 15:20 -0800  Brendan Cully  <brendan@kublai.com>  (f8fd60d8d3f2)
+
+       * COPYRIGHT: Update copyrights
+
+       * addrbook.c, ascii.h, attach.c, bcache.c, bcache.h, browser.c,
+       browser.h, charset.c, charset.h, commands.c, complete.c,
+       compose.c, crypt-gpgme.c, crypt.c, curs_main.c, dotlock.c,
+       editmsg.c, enter.c, functions.h, gnupgparse.c, handler.c,
+       hdrline.c, hook.c, init.h, lib.c, lib.h, menu.c, mh.c,
+       mutt_idna.c, mutt_idna.h, mutt_sasl.h, mutt_socket.c, muttlib.c,
+       mx.c, pager.c, pattern.c, pgp.c, pgp.h, pgpinvoke.c, pgpkey.c,
+       pgplib.c, pgplib.h, pgppacket.c, pgppubring.c, pop.c, postpone.c,
+       protos.h, query.c, recvattach.c, recvcmd.c, remailer.c, rfc1524.c,
+       rfc2047.c, rfc2231.c, rfc3676.h, send.c, setenv.c, status.c,
+       url.c: Update copyrights. Closes #3016. I went through the logs of
+       each file with a copyright header and updated the years for the
+       authors in the headers for any non-comment changes they
+       introduced. What a pain!
 
        * imap/auth_anon.c, imap/auth_cram.c, imap/auth_login.c,
        imap/auth_sasl.c, imap/browse.c, imap/imap.h, imap/message.h,

diff --git a/pgpkey.c b/pgpkey.c
index 461917dd9e6861ff6df1a297f15a6523e3046718..3d81932b9d43b9e962df2712e4929d6280ee891b 100644 (file)
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -817,12 +817,7 @@ pgp_key_t pgp_getkeybyaddr (ADDRESS * a, short abilities, pgp_ring_t keyring)
   ADDRESS *r, *p;
   LIST *hints = NULL;
 
-  int weak    = 0;
-  int invalid = 0;
   int multi   = 0;
-  int this_key_has_strong;
-  int this_key_has_weak;
-  int this_key_has_invalid;
   int match;
 
   pgp_key_t keys, k, kn;
@@ -862,9 +857,6 @@ pgp_key_t pgp_getkeybyaddr (ADDRESS * a, short abilities, pgp_ring_t keyring)
       continue;
     }
 
-    this_key_has_weak    = 0;  /* weak but valid match   */
-    this_key_has_invalid = 0;   /* invalid match          */
-    this_key_has_strong  = 0;  /* strong and valid match */
     match                = 0;   /* any match             */
 
     for (q = k->address; q; q = q->next)
@@ -885,23 +877,12 @@ pgp_key_t pgp_getkeybyaddr (ADDRESS * a, short abilities, pgp_ring_t keyring)
          if (the_valid_key && the_valid_key != k)
            multi             = 1;
          the_valid_key       = k;
-         this_key_has_strong = 1;
        }
-       else if ((validity & PGP_KV_MATCH) && !(validity & PGP_KV_VALID))
-         this_key_has_invalid = 1;
-       else if ((validity & PGP_KV_MATCH) 
-                && (!(validity & PGP_KV_STRONGID) || !(validity & PGP_KV_ADDR)))
-         this_key_has_weak    = 1;
       }
 
       rfc822_free_address (&r);
     }
 
-    if (match && !this_key_has_strong && this_key_has_invalid)
-      invalid = 1;
-    if (match && !this_key_has_strong && this_key_has_weak)
-      weak = 1;
-    
     if (match)
     {
       *last  = pgp_principal_key (k);
@@ -914,8 +895,7 @@ pgp_key_t pgp_getkeybyaddr (ADDRESS * a, short abilities, pgp_ring_t keyring)
   
   if (matches)
   {
-    if (the_valid_key && !multi /* && !weak 
-       && !(invalid && option (OPTPGPSHOWUNUSABLE)) */)
+    if (the_valid_key && !multi)
     {
       /*
        * There was precisely one strong match on a valid ID.