aboutsummaryrefslogtreecommitdiffstats
path: root/sink.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2001-12-14 09:00:32 +0000
committerEric S. Raymond <esr@thyrsus.com>2001-12-14 09:00:32 +0000
commit014bf0c61c6276be160725c4acb7d0b817e7e118 (patch)
tree90429e6ef20c0a5d450cf92d1fa43b4cabc1c5f3 /sink.c
parent2a8d12fedded17916377e0de82afed0c8e54c759 (diff)
downloadfetchmail-014bf0c61c6276be160725c4acb7d0b817e7e118.tar.gz
fetchmail-014bf0c61c6276be160725c4acb7d0b817e7e118.tar.bz2
fetchmail-014bf0c61c6276be160725c4acb7d0b817e7e118.zip
Slight change in bounce logic.
svn path=/trunk/; revision=3562
Diffstat (limited to 'sink.c')
-rw-r--r--sink.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/sink.c b/sink.c
index c7528612..e7e4d5c0 100644
--- a/sink.c
+++ b/sink.c
@@ -402,10 +402,11 @@ static int handle_smtp_report(struct query *ctl, struct msgblk *msg)
* ESMTP server. Don't try to ship the message,
* and allow it to be deleted.
*/
- send_bouncemail(ctl, msg, XMIT_ACCEPT,
+ if (run.bouncemail)
+ send_bouncemail(ctl, msg, XMIT_ACCEPT,
"This message was too large (SMTP error 552).\r\n",
1, responses);
- return(run.bouncemail ? PS_REFUSED : PS_TRANSIENT);
+ return(PS_REFUSED);
case 553: /* invalid sending domain */
/*
@@ -415,9 +416,12 @@ static int handle_smtp_report(struct query *ctl, struct msgblk *msg)
* (b) we wouldn't want spammers to get confirmation that
* this address is live, anyway.
*/
- send_bouncemail(ctl, msg, XMIT_ACCEPT,
+#ifdef __DONT_FEED_THE_SPAMMERS__
+ if (run.bouncemail)
+ send_bouncemail(ctl, msg, XMIT_ACCEPT,
"Invalid address in MAIL FROM (SMTP error 553).\r\n",
1, responses);
+#endif /* __DONT_FEED_THE_SPAMMERS__ */
return(PS_REFUSED);
default: