Fixes by Matthias Andree.

svn path=/trunk/; revision=3571

5 files changed, 37 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 025017fb..edb844f2 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@
 * Updated German (de) po file.  Added Turkish (tr) po file.
 * Expunge edge case fix by Sunil Shetye.
 * Fixes for some odd IMAP and SMTP edge cases by Sunil Shetye.
+* UIDL bug fix by Matthias Andree.
 
 fetchmail-5.9.6 (Fri Dec 14 04:03:50 EST 2001), 21247 lines:
 
diff --git a/driver.c b/driver.c
index aa35cfa4..eb34010a 100644
--- a/driver.c
+++ b/driver.c
@@ -632,8 +632,14 @@ static int fetch_messages(int mailserver_socket, struct query *ctl,
 	 * now.
 	 */
 
-	/* tell the UID code we've seen this */
-	if (ctl->newsaved)
+	/*
+	 * Tell the UID code we've seen this.
+	 * Matthias Andree: only register the UID if we could actually
+	 * forward this mail. If we omit this !suppress_forward check,
+	 * fetchmail will never retry mail that the local listener
+	 * refused temporarily.
+	 */
+	if (ctl->newsaved && !suppress_delete)
 	{
 	    struct idlist	*sdp;
 
diff --git a/env.c b/env.c
index 93651a44..e69fea0f 100644
--- a/env.c
+++ b/env.c
@@ -66,6 +66,19 @@ void envquery(int argc, char **argv)
 	exit(PS_UNDEFINED);
     }
 
+    if (getenv("NULLMAILER_FLAGS") && strcmp(getenv("NULLMAILER_FLAGS"), ""))
+    {
+	fprintf(stderr,
+		GT_("%s: The NULLMAILER_FLAGS environment variable is set.\n"
+		    "This is dangerous as it can make nullmailer-inject
+or nullmailer's\n" 
+		    "sendmail wrapper tamper with your From:, Message-ID: or Return-Path: headers.\n"
+		    "Try \"env NULLMAILER_FLAGS= %s YOUR ARGUMENTS HERE\"\n"
+		    "%s: Abort.\n"), 
+		program_name, program_name, program_name);
+	exit(PS_UNDEFINED);
+    }
+
     if (!(pwp = getpwuid(getuid())))
     {
 	fprintf(stderr,
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index 3760fe77..321b5600 100644
--- a/fetchmail-FAQ.html
+++ b/fetchmail-FAQ.html
@@ -10,7 +10,7 @@
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 2002/02/01 02:14:23 $
+<td width="30%" align=right>$Date: 2002/02/01 21:47:49 $
 </table>
 <HR>
 <H1>Frequently Asked Questions About Fetchmail</H1>
@@ -73,6 +73,7 @@ IP address?</a><br>
 <a href="#T4">T4. How can I use fetchmail with smail?</a><br>
 <a href="#T5">T5. How can I use fetchmail with SCO's MMDF?</a><br>
 <a href="#T6">T6. How can I use fetchmail with Lotus Notes?</a><br>
+<a href="#T7">T7. How can I use fetchmail with Courier IMAP?</a><br>
 
 <h1>How to make fetchmail work with various servers:</h1>
 
@@ -1322,6 +1323,11 @@ According to RFC1123 an SMTP listener <em>must</em> allow this
 mismatch, so smail's new behavior (introduced sometime between
 3.2.0.90 and 3.2.0.95) is a bug.
 
+<p>You may also need to say
+<code>-smtp_hello_broken_allow=127.0.0.1</code>
+in order for smail to accept the "localhost" that fetchmail normally 
+appends to recipient addresses.
+
 <hr>
 <h2><a name="T5">T5. How can I use fetchmail with SCO's MMDF?</a></h2>
 
@@ -1339,6 +1345,12 @@ fetchmail feeding MMDF.
 to \r\n, but its rules are not the intuitive and correct-for-RFC822
 ones.  Use `forcecr'.
 
+<a name="T7">T7. How can I use fetchmail with Courier IMAP?</a></h2>
+
+<p>The courier mta doesn't like RCPT addresses that look like 
+<code>someone@localhost</code>.  Work around this with an 
+<code>smtphost</code> or <code>smtpaddress</code>.
+
 <hr>
 <h2><a name="S1">S1. How can I use fetchmail with qpopper?</a></h2>
 
@@ -2993,7 +3005,7 @@ date from the last Received header.<p>
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 2002/02/01 02:14:23 $
+<td width="30%" align=right>$Date: 2002/02/01 21:47:49 $
 </table>
 
 <ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@thyrsus.com&gt;</A></ADDRESS>
diff --git a/sink.c b/sink.c
index 8b7484c4..cbed595e 100644
--- a/sink.c
+++ b/sink.c
@@ -453,7 +453,7 @@ static int handle_smtp_report(struct query *ctl, struct msgblk *msg)
 	 *
 	 * Bouncemail *might* be appropriate here as a delay
 	 * notification (note; if we ever add this, we must make
-	 * sure the RFC1894 Action field is "delayed" rather thwn
+	 * sure the RFC1894 Action field is "delayed" rather than
 	 * "failed").  But it's not really necessary because
 	 * these are not actual failures, we're very likely to be
 	 * able to recover on the next cycle.