aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>1997-05-06 07:18:59 +0000
committerEric S. Raymond <esr@thyrsus.com>1997-05-06 07:18:59 +0000
commite652084c7e5eb0281ade3f988605ede00263f964 (patch)
treeffe49dfb2dccfdfc09d94cb385a6179e077fc475
parent8f46eccd144567b9450c2dbe7586fb70b2d05154 (diff)
downloadfetchmail-e652084c7e5eb0281ade3f988605ede00263f964.tar.gz
fetchmail-e652084c7e5eb0281ade3f988605ede00263f964.tar.bz2
fetchmail-e652084c7e5eb0281ade3f988605ede00263f964.zip
Make header rewrite play better with exim.
svn path=/trunk/; revision=982
-rw-r--r--INSTALL5
-rw-r--r--NEWS3
-rw-r--r--fetchmail-FAQ.html34
-rw-r--r--rfc822.c21
4 files changed, 39 insertions, 24 deletions
diff --git a/INSTALL b/INSTALL
index 70fe0595..67515aac 100644
--- a/INSTALL
+++ b/INSTALL
@@ -61,8 +61,9 @@ wish to change these defaults, edit the Makefile AFTER you run
a prefix other than /usr/local, or you can choose completely different
directories for each item.
-NOTE: If you are using exim, you must configure it to accept local
-addresses as valid RCPT TO lines.
+NOTE: If you are using an MTA other than sendmail (such as qmail or exim),
+see the FAQ (section T) for discussion of any special configuration steps
+that may be necessary.
4. SET UP A RUN CONTROL FILE
diff --git a/NEWS b/NEWS
index dc339569..3b4653bd 100644
--- a/NEWS
+++ b/NEWS
@@ -38,8 +38,9 @@ pl 3.9.3 ():
* Fix for -I option from George Sipe.
* Finally got error.c to compile under AIX, thanks to Dave Vinish.
* Prevent header rerwrite logic from appending mailserver name to blank To.
+* When header rewrite is on, hack Return-Path as well.
-There are 224 people on the fetchmail-friends list.
+There are 240 people on the fetchmail-friends list.
pl 3.9.2 (Wed Apr 23 14:07:03 EDT 1997):
* Fixed a glitch in the Makefile yacc and lex productions
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index e3d7b5da..712273b6 100644
--- a/fetchmail-FAQ.html
+++ b/fetchmail-FAQ.html
@@ -9,9 +9,9 @@
<BODY>
<H1>Frequently Asked Questions About Fetchmail</H1>
-$Id: fetchmail-FAQ.html,v 1.9 1997/05/03 02:38:26 esr Exp $<p>
+$Id: fetchmail-FAQ.html,v 1.10 1997/05/06 07:18:59 esr Exp $<p>
-(Added <a href="#O4">O3</a> on nonexistent logfiles.)<p>
+(New: <a href="#T2">T2</a> on using fetchmail with exim.)<p>
Before reporting any bug, please read <a href="#G3">G3</a> for advice
on how to include diagnostic information that will get your bug fixed
@@ -55,10 +55,14 @@ fetchmail-friends-request@thyrsus.com</a>. <p>
<a href="#C3">C3. How do I know what interface and address to use with --interface?</a><br>
<a href="#C4">C4. How can I get fetchmail to work with ssh?</a><br>
<a href="#C5">C5. How can I set up support for sendmail's anti-spam 571 response?</a><br>
-<a href="#C6">C6. How can I use fetchmail with qmail?</a><br>
-<a href="#C7">C7. How can I do automatic startup/shutdown of fetchmail
+<a href="#C6">C6. How can I do automatic startup/shutdown of fetchmail
when I may have multiple login sessions going?</a><br>
+<h1>Configuration tips for non-sendmail MTAs</h1>
+
+<a href="#T1">T1. How can I use fetchmail with qmail?</a><br>
+<a href="#T2">T2. How can I use fetchmail with exim?</a><br>
+
<h1>Runtime fatal errors:</h1>
<a href="#R1">R1. I think I've set up fetchmail correctly, but I'm not getting any mail.</a><br>
@@ -575,7 +579,16 @@ to allow sendmail to process the message further and generate an error
message to the sender. <p>
<hr>
-<h2><a name="C6">C6. How can I use fetchmail with qmail?</a></h2>
+<h2><a name="C6">C6. How can I do automatic startup/shutdown of fetchmail
+when I may have multiple login sessions going?</h2>
+
+In the contrib subdirectory of the fetchmail distribution there is
+some shell code you can add to your .bash_login and .bash_logout
+profiles that will accomplish this. Thank James Laferriere
+&lt;babydr@nwrain.net&gt; for it.<p>
+
+<hr>
+<h2><a name="T1">T1. How can I use fetchmail with qmail?</a></h2>
Turn on the <tt>forcecr</tt> option; qmail's listener mode doesn't like
header or message lines terminated with bare linefeeds.<p>
@@ -637,13 +650,12 @@ in the alias directory (normally /var/qmail/alias) with the contents:<p>
Note this <em>does</em> require a modern /bin/sh.<p>
<hr>
-<h2><a name="C7">C7. How can I do automatic startup/shutdown of fetchmail
-when I may have multiple login sessions going?</h2>
+<h2><a name="T2">T2. How can I use fetchmail with exim?</a></h2>
-In the contrib subdirectory of the fetchmail distribution there is
-some shell code you can add to your .bash_login and .bash_logout
-profiles that will accomplish this. Thank James Laferriere
-&lt;babydr@nwrain.net&gt; for it.<p>
+There is a switch somewhere in exim's configuration files that allows
+it to accept domainless MAIL FROM addresses; you may have to flip that
+if you're running a fetchmail version prior to 3.9.3. Otherwise
+you're all set.<p>
<hr>
<h2><a name="R1">R1. I think I've set up fetchmail correctly, but I'm not getting any mail.</a></h2>
diff --git a/rfc822.c b/rfc822.c
index 1b83bee5..267c06e5 100644
--- a/rfc822.c
+++ b/rfc822.c
@@ -29,11 +29,12 @@ const char *host; /* server hostname */
char *from, *cp;
int parendepth, state, has_bare_name_part, has_host_part;
- if (strncmp("From: ", buf, 6)
- && strncmp("To: ", buf, 4)
- && strncmp("Reply-", buf, 6)
- && strncmp("Cc: ", buf, 4)
- && strncmp("Bcc: ", buf, 5)) {
+ if (strncasecmp("From: ", buf, 6)
+ && strncasecmp("To: ", buf, 4)
+ && strncasecmp("Reply-To: ", buf, 10)
+ && strncasecmp("Return-Path: ", buf, 13)
+ && strncasecmp("Cc: ", buf, 4)
+ && strncasecmp("Bcc: ", buf, 5)) {
return;
}
@@ -312,11 +313,11 @@ main(int argc, char *argv[])
{
if (buf[0] == ' ' || buf[0] == '\t')
strcat(longbuf, buf);
- else if (!strncmp("From: ", buf, 6)
- || !strncmp("To: ", buf, 4)
- || !strncmp("Reply-", buf, 6)
- || !strncmp("Cc: ", buf, 4)
- || !strncmp("Bcc: ", buf, 5))
+ else if (!strncasecmp("From: ", buf, 6)
+ || !strncasecmp("To: ", buf, 4)
+ || !strncasecmp("Reply-", buf, 6)
+ || !strncasecmp("Cc: ", buf, 4)
+ || !strncasecmp("Bcc: ", buf, 5))
strcpy(longbuf, buf);
else if (longbuf[0])
{