Better bounce behavior.

svn path=/trunk/; revision=2359

diff --git a/NEWS b/NEWS
index f0160842c32949394558557ef3944f27aca429a8..fbdb18c4f6e2aa01d95abfb7f3320be787039a29 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,8 @@ fetchmail-4.7.6 ():
 * All bounce messages now use FQDN return paths.
 * Check for background nmode before generating oversized-message mail.  Duh!
 * Paul Murphy's improvements for SDPS.
+* Message deletion on miscellaneous 5xx SMTP errors is suppressed unless a
+  bounce can be sent.
 
 There are 263 people on fetchmail-friends and 343 on fetchmail-announce.
 

diff --git a/fetchmail.man b/fetchmail.man
index 76b5c6d53f9795e61dc1d2d2695a722be58a4584..7e100034bb62ab6326e31e800070ded523451aa7 100644 (file)
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -843,9 +843,10 @@ The
 .I fetchmail
 code recognizes and discards the message on any of a list of responses
 that defaults to [571, 550, 501] but can be set with the `antispam'
-option.  This is the
+option.  This is one of the
 .I only
-circumstance under which fetchmail ever discards mail.
+two circumstance under which fetchmail ever discards mail (the others
+are the 552 and 553 errors described below).
 .PP
 If
 .I fetchmail

diff --git a/sink.c b/sink.c
index 155312243aa9a3886beceecc0784c9d776e08f39..94e1a3ae6695bc7334f46b4cc1eef29d83bf08a8 100644 (file)
--- a/sink.c
+++ b/sink.c
@@ -455,10 +455,12 @@ static int handle_smtp_report(struct query *ctl, struct msgblk *msg)
        return(PS_REFUSED);
 
     default:   /* bounce the error back to the sender */
-       send_bouncemail(msg, XMIT_ACCEPT,
+       if (send_bouncemail(msg, XMIT_ACCEPT,
                        "General SMTP/ESMTP error.\r\n", 
-                       1, responses);
-       return(PS_REFUSED);
+                       1, responses))
+           return(PS_REFUSED);
+       else
+           return(PS_TRANSIENT);
     }
 }