From 361cefb5747b93aa3a6510af017ec89390673c38 Mon Sep 17 00:00:00 2001 From: Sunil Shetye Date: Thu, 14 Oct 2010 00:46:31 +0530 Subject: Fix "antispam does not work" This appears to be similar to the recent --nosoftbounce and --nobounce issue where command line options are not handled exactly the same way as the rcfile parser handles them. Reported by Kees Bakker, BerliOS bug #17599. --- sink.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'sink.c') diff --git a/sink.c b/sink.c index 3abbd605..92f7b433 100644 --- a/sink.c +++ b/sink.c @@ -441,8 +441,6 @@ static int handle_smtp_report(struct query *ctl, struct msgblk *msg) { int smtperr = atoi(smtp_response); char *responses[1]; - struct idlist *walk; - int found = 0; responses[0] = xstrdup(smtp_response); @@ -466,15 +464,7 @@ static int handle_smtp_report(struct query *ctl, struct msgblk *msg) * messages, which are probably in English (none of the * MTAs I know about are internationalized). */ - for( walk = ctl->antispam; walk; walk = walk->next ) - if ( walk->val.status.num == smtperr ) - { - found=1; - break; - } - - /* if (str_find(&ctl->antispam, smtperr)) */ - if ( found ) + if (str_find(&ctl->antispam, smtperr)) { /* * SMTP listener explicitly refuses to deliver mail -- cgit v1.2.3