From 366dd1cb3c250a41574829f5f8379dab08824408 Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Wed, 30 Dec 1998 05:04:17 +0000
Subject: Full SMTP response check om EOM.

svn path=/trunk/; revision=2294
---
 NEWS        | 4 ++++
 indexgen.sh | 5 +++--
 sink.c      | 9 +++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index b7eb4df2..0888061d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@
 
 fetchmail-4.7.3 ():
 * Added new FAQ item G11 and added material to R1.
+* Do a full antispam check on the EOM response in case the MTA does
+  content analysis.
+
+There are 246 people on fetchmail-friends and 329 on fetchmail-announce.
 
 fetchmail-4.7.2 (Fri Dec 25 01:01:54 EST 1998):
 * Don't append the destination address to a postmaster name containing @.
diff --git a/indexgen.sh b/indexgen.sh
index 75fdc74f..6a000fad 100755
--- a/indexgen.sh
+++ b/indexgen.sh
@@ -229,8 +229,9 @@ OS/2 port</a> is available from Jason F. McBrayer.<p>
 Jochen Hayek is developing a set of
 <a href="http://www.ACM.org/~Jochen_Hayek/JHimap_utils/">
 IMAP tools in Python</a> that read your .fetchmailrc file and are
-designed to work with fetchmail.   Jochen's tools can get subject listings
-or move incoming messages to named mailboxes.<p>
+designed to work with fetchmail.   Jochen's tools can report selected
+header lines, or move incoming messages to named mailboxes based on
+the contents of headers.<p>
 
 <H1>Fetchmail's funniest fan letter:</H1>
 
diff --git a/sink.c b/sink.c
index c7e476b6..e6fcfcde 100644
--- a/sink.c
+++ b/sink.c
@@ -826,8 +826,13 @@ int close_sink(struct query *ctl, struct msgblk *msg, flag forward)
 	/* write message terminator */
 	if (SMTP_eom(ctl->smtp_socket) != SM_OK)
 	{
-	    error(0, -1, _("SMTP listener refused delivery"));
-	    return(FALSE);
+	    if (handle_smtp_error(ctl, msg) != PS_REFUSED)
+		return(FALSE);
+	    else
+	    {
+		error(0, -1, _("SMTP listener refused delivery"));
+		return(TRUE);
+	    }
 	}
 
 	/*
-- 
cgit v1.2.3