From b4d7ece582604895694ea538e8aa52acb41315fe Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Tue, 4 Apr 2006 12:15:16 +0000 Subject: set no bouncemail now also prevents 'General SMTP/ESMTP error.' bounces. svn path=/branches/BRANCH_6-3/; revision=4780 --- NEWS | 2 ++ sink.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index ca6d8322..5e9e512e 100644 --- a/NEWS +++ b/NEWS @@ -44,6 +44,8 @@ fetchmail 6.3.4 (not yet released): * tracepolls: add folder information if available. Reported by Terry Brown. * lexer: add %option noyywrap to avoid link errors about missing yywrap(). * a few more type fixes for report/snprintf, patch by Miloslav Trmac. +* bouncing: fetchmail would still send "General SMTP/ESMTP error." bounces + in spite of "no bouncemail" configuration. # CHANGES: * pidfile: there is a new command-line (--pidfile PATH) and global option for diff --git a/sink.c b/sink.c index c4a26f6b..274729e9 100644 --- a/sink.c +++ b/sink.c @@ -539,7 +539,8 @@ static int handle_smtp_report(struct query *ctl, struct msgblk *msg) /* bounce non-transient errors back to the sender */ if (smtperr >= 500 && smtperr <= 599) { - send_bouncemail(ctl, msg, XMIT_ACCEPT, + if (run.bouncemail) + send_bouncemail(ctl, msg, XMIT_ACCEPT, "General SMTP/ESMTP error.\r\n", 1, responses); free(responses[0]); -- cgit v1.2.3