Fixed issue #3829 BlackList and WhiteList do not take into account the active attribute

Till Brehm · Till Brehm · commit 2a37f920298b · 2016-04-20T17:49:10.000+02:00
diff --git a/install/tpl/amavisd_user_config.master b/install/tpl/amavisd_user_config.master
@@ -37,7 +37,7 @@ $sql_select_policy =
 
 
 $sql_select_white_black_list = 'SELECT wb FROM spamfilter_wblist'.
-    ' WHERE (spamfilter_wblist.rid=?) AND (spamfilter_wblist.email IN (%k))' .
+    ' WHERE (spamfilter_wblist.rid=?) AND (spamfilter_wblist.email IN (%k)) AND (spamfilter_wblist.active="y")' .
     ' ORDER BY spamfilter_wblist.priority DESC';
 
 #

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ $sql_select_policy =`
`37`	`37`
`38`	`38`
`39`	`39`	`$sql_select_white_black_list = 'SELECT wb FROM spamfilter_wblist'.`
`40`		`- ' WHERE (spamfilter_wblist.rid=?) AND (spamfilter_wblist.email IN (%k))' .`
	`40`	`+ ' WHERE (spamfilter_wblist.rid=?) AND (spamfilter_wblist.email IN (%k)) AND (spamfilter_wblist.active="y")' .`
`41`	`41`	`' ORDER BY spamfilter_wblist.priority DESC';`
`42`	`42`
`43`	`43`	`#`