From 2a37f920298ba612f50e9f2b52a99a7f9f50b54f Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 20 Apr 2016 11:49:10 -0400
Subject: [PATCH] Fixed issue #3829 BlackList and WhiteList do not take into account the active attribute

---
 install/tpl/amavisd_user_config.master |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/tpl/amavisd_user_config.master b/install/tpl/amavisd_user_config.master
index c729a7c..621e029 100644
--- a/install/tpl/amavisd_user_config.master
+++ b/install/tpl/amavisd_user_config.master
@@ -37,7 +37,7 @@
 
 
 $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';
 
 #

--
Gitblit v1.9.1