From 621035704f4e6b2cb607f0dca46312abe54b0c54 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Fri, 1 Feb 2002 21:47:50 +0000 Subject: Fixes by Matthias Andree. svn path=/trunk/; revision=3571 --- NEWS | 1 + driver.c | 10 ++++++++-- env.c | 13 +++++++++++++ fetchmail-FAQ.html | 16 ++++++++++++++-- sink.c | 2 +- 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 @@
Back to Fetchmail Home Page To Site Map -$Date: 2002/02/01 02:14:23 $ +$Date: 2002/02/01 21:47:49 $

Frequently Asked Questions About Fetchmail

@@ -73,6 +73,7 @@ IP address?
T4. How can I use fetchmail with smail?
T5. How can I use fetchmail with SCO's MMDF?
T6. How can I use fetchmail with Lotus Notes?
+T7. How can I use fetchmail with Courier IMAP?

How to make fetchmail work with various servers:

@@ -1322,6 +1323,11 @@ According to RFC1123 an SMTP listener must allow this mismatch, so smail's new behavior (introduced sometime between 3.2.0.90 and 3.2.0.95) is a bug. +

You may also need to say +-smtp_hello_broken_allow=127.0.0.1 +in order for smail to accept the "localhost" that fetchmail normally +appends to recipient addresses. +

T5. How can I use fetchmail with SCO's MMDF?

@@ -1339,6 +1345,12 @@ fetchmail feeding MMDF. to \r\n, but its rules are not the intuitive and correct-for-RFC822 ones. Use `forcecr'. +T7. How can I use fetchmail with Courier IMAP? + +

The courier mta doesn't like RCPT addresses that look like +someone@localhost. Work around this with an +smtphost or smtpaddress. +

S1. How can I use fetchmail with qpopper?

@@ -2993,7 +3005,7 @@ date from the last Received header.

Back to Fetchmail Home Page To Site Map -$Date: 2002/02/01 02:14:23 $ +$Date: 2002/02/01 21:47:49 $

Eric S. Raymond <esr@thyrsus.com>
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. -- cgit v1.2.3