From c41fbfc158e89ce22c3f906be891e5a596b39d8d Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Wed, 7 Feb 2001 04:10:02 +0000
Subject: Ready to ship, but no ATRN.

svn path=/trunk/; revision=3024
---
 NEWS               |  1 +
 design-notes.html  | 11 +++++++----
 driver.c           | 15 +++++++++++++++
 fetchmail-FAQ.html | 12 ++++++++++--
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 0cc5301a..4309c30d 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@
 * Fixed a bug in configure.in that was resulting in KERBEROS_IV being
   set when it should not have been (several reports).
 * FAQ change: mailing lists have moved to MailMan.
+* Deal with brain-dead netmind mail missing the RFC822 delimiter line.
 
 fetchmail-5.6.2 (Fri Jan  5 16:45:47 EST 2001), 19744 lines:
 
diff --git a/design-notes.html b/design-notes.html
index 11b17511..d5cdeaed 100644
--- a/design-notes.html
+++ b/design-notes.html
@@ -10,7 +10,7 @@
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="/~esr/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: 2000/11/26 18:20:27 $
+<td width="30%" align=right>$Date: 2001/02/07 04:10:01 $
 </table>
 <HR>
 <H1 ALIGN=CENTER>Design Notes On Fetchmail</H1>
@@ -537,8 +537,11 @@ all shaped the design in one way or another.<P>
 <DD> POP3 Extension Mechanism
 <DT><A HREF="ftp://ftp.isi.edu/in-notes/rfc2683.txt">RFC2683</A>
 <DD> IMAP4 Implementation Recommendations
-<DD><A HREF="http://www.faqs.org/rfcs/rfc2595.html"></A>
-</DL> Using TLS with IMAP, POP3 and ACAP
+<DT><A HREF="ftp://ftp.isi.edu/in-notes/rfc2595.html">RFC2595</A>
+<DD>Using TLS with IMAP, POP3 and ACAP
+<DT><A HREF="ftp://ftp.isi.edu/in-notes/rfc2645.html">RFC2645</A>
+<DD>On-Demand Mail Relay: SMTP with Dynamic IP Addresses
+</DL>
 <!--
 RFC2192 IMAP URL Scheme
 RFC2193 IMAP4 Mailbox Referrals
@@ -549,7 +552,7 @@ RFC2221 IMAP4 Login Referrals
 <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: 2000/11/26 18:20:27 $
+<td width="30%" align=right>$Date: 2001/02/07 04:10:01 $
 </table>
 
 <P><ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>
diff --git a/driver.c b/driver.c
index 49c04f81..d6223f12 100644
--- a/driver.c
+++ b/driver.c
@@ -531,6 +531,21 @@ static int readheaders(int sock,
 		goto process_headers;
 	    }
 
+	    /*
+	     * At least one brain-dead website (netmind.com) is known to
+	     * send out robotmail that's missing the RFC822 delimiter blank
+	     * line before the body! Without this check fetchmail segfaults.
+	     * With it, we treat such messages as though they had the missing
+	     * blank line.
+	     */
+	    if (!isspace(line[0]) && !strchr(line, ":"))
+	    {
+		headers_ok = TRUE;
+		free(line);
+		has_nuls = (linelen != strlen(line));
+		goto process_headers;
+	    }
+
 	    /* check for RFC822 continuations */
 	    set_timeout(mytimeout);
 	    ch = SockPeek(sock);
diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index 791915d3..edc2a455 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: 2001/02/07 00:47:40 $
+<td width="30%" align=right>$Date: 2001/02/07 04:10:02 $
 </table>
 <HR>
 <H1>Frequently Asked Questions About Fetchmail</H1>
@@ -1732,6 +1732,14 @@ poll mailhost port 1234 via localhost with proto pop3:
         preconnect "ssh -l username -f mailhost -L 1234:mailhost:110 sleep 5"
 </pre>
 
+This is an SSH 1.x recipe.  According to Mick Papadonis, the
+equivalent SSH 2.x recipe is this:<p>
+
+<pre>
+poll localhost port 1234 with proto pop3:
+        preconnect "ssh -n -S -x -l username -fo mailhost -L 1234:mailhost:110; sleep 5"
+</pre>
+
 The sleep is needed on slower machines to prevent fetchmail from
 trying to open the socket before ssh actually makes it ready.  Faster
 machines may not need it.<p>
@@ -2978,7 +2986,7 @@ switching to IMAP and using a short expunge interval.<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: 2001/02/07 00:47:40 $
+<td width="30%" align=right>$Date: 2001/02/07 04:10:02 $
 </table>
 
 <P><ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>
-- 
cgit v1.2.3