Ready for the experiment.

svn path=/trunk/; revision=2803

diff --git a/NEWS b/NEWS
index 19ff3b3b5f42be84c76e8f0f521f1c50f2b0b44e..4fc2d4e28616993c362ff5e996ef02c375f08bdb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@
 * Fixed a bug in fetchmailconf's handling of envelope skip prefixes.
 * Don't nuke .fetchids when authorization failure keeps us from getting URLs.
 * Added FAQ item X6 on dropped and mangled attachments, thanks to Rob Funk.
+* Teach configure.in to link the RSA reference library if available.
+* Disable saving of Message-IDs into UIDL lists.
 
 There are 291 people on fetchmail-friends and 500 on fetchmail-announce.
 

diff --git a/configure.in b/configure.in
index 6abadb607b81578e0d04ba94cee888643005501a..b753344a8f98165d42b7971653d51888a1631ac1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -154,6 +154,9 @@ AC_CHECK_FUNC(res_search,
 dnl Check for libcrypt
 AC_CHECK_LIB(crypt,crypt)
 
+dnl Check for RSA refersence library in case we're using SSL
+AC_CHECK_LIB(rsaref, _RSAPublicDecrypt)
+
 dnl AC_FUNC_SETVBUF_REVERSED
 
 dnl Check for usable void pointer type

diff --git a/driver.c b/driver.c
index b10a1dd40288ed253bb527f9d3238f6dddd9ffd0..2dfbd910394c2766f4266bcae1ea8c41f7e2ff04 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -725,6 +725,7 @@ static int readheaders(int sock,
        else if (!strncasecmp("Resent-Sender:", line, 14))
            resent_sender_offs = (line - msgblk.headers);
 
+#ifdef __UNUSED__
        else if (!strncasecmp("Message-Id:", buf, 11))
        {
            if (ctl->server.uidl)
@@ -740,6 +741,7 @@ static int readheaders(int sock,
                }
            }
        }
+#endif /* __UNUSED__ */
 
        else if (!MULTIDROP(ctl))
            continue;

diff --git a/uid.c b/uid.c
index 2f388a23423ebcc659e821308b69431f52e99965..ce8759564c4f8b12015fa648e3f64a649240e94d 100644 (file)
--- a/uid.c
+++ b/uid.c
@@ -429,7 +429,7 @@ void uid_end_query(struct query *ctl)
      * This is necessary in order to keep UIDL information
      * from being heedlessly deleted later on.
      */
-    if (ctl->have_uids)
+    if (ctl->newsaved)
     {
        /* old state of mailbox may now be irrelevant */
        if (outlevel >= O_DEBUG)
@@ -438,7 +438,6 @@ void uid_end_query(struct query *ctl)
        free_str_list(&scratchlist);
        ctl->oldsaved = ctl->newsaved;
        ctl->newsaved = (struct idlist *) NULL;
-       ctl->have_uids = FALSE;
     }
     else if (outlevel >= O_DEBUG)
        report(stdout, "not swapping UID lists, no UIDs seen this query\n");