diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | fetchmail.man | 5 | ||||
| -rw-r--r-- | sink.c | 8 |
3 files changed, 10 insertions, 5 deletions
@@ -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 76b5c6d5..7e100034 100644 --- 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 @@ -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); } } |