RBL: change behaviour of whitelists

1 files changed, 20 insertions, 14 deletions

diff --git a/conf/modules.conf b/conf/modules.conf
index 413e7e00b..6d2822cca 100644
--- a/conf/modules.conf
+++ b/conf/modules.conf
@@ -120,6 +120,7 @@ rbl {
         symbol = "RWL_SPAMHAUS_WL";
         rbl = "swl.spamhaus.org";
         ipv6 = true;
+        is_whitelist = true;
         returncodes {
             RWL_SPAMHAUS_WL_IND = "127.0.2.2";
             RWL_SPAMHAUS_WL_TRANS = "127.0.2.3";
@@ -128,20 +129,23 @@ rbl {
         }
     }
 
-    mailspike {
-       symbol = "RBL_MAILSPIKE";
-       rbl = "rep.mailspike.net";
-         returncodes {
-            #http://mailspike.net/usage.html
-            RBL_MAILSPIKE_WORST = "127.0.0.10"
-            RBL_MAILSPIKE_VERYBAD = "127.0.0.11"
-            RBL_MAILSPIKE_BAD = "127.0.0.12"
-            RBL_MAILSPIKE_SUSP = "127.0.0.13"
-            RBL_MAILSPIKE_PROB = "127.0.0.14"
-            RWL_MAILSPIKE_POSSIBLE = "127.0.0.17"
-            RWL_MAILSPIKE_GOOD = "127.0.0.18"
-            RWL_MAILSPIKE_VERYGOOD = "127.0.0.19"
-            RWL_MAILSPIKE_EXCELLENT = "127.0.0.20"
+    mailspike_bl {
+       rbl = "bl.mailspike.net";
+       returncodes {
+            RBL_MAILSPIKE_ZOMBIE = "127.0.0.2";
+            RBL_MAILSPIKE_WORST = "127.0.0.10";
+            RBL_MAILSPIKE_VERYBAD = "127.0.0.11";
+            RBL_MAILSPIKE_BAD = "127.0.0.12";
+       }
+    }
+
+    mailspike_wl {
+       rbl = "wl.mailspike.net";
+       returncodes {
+            RWL_MAILSPIKE_POSSIBLE = "127.0.0.17";
+            RWL_MAILSPIKE_GOOD = "127.0.0.18";
+            RWL_MAILSPIKE_VERYGOOD = "127.0.0.19";
+            RWL_MAILSPIKE_EXCELLENT = "127.0.0.20";
          }
     }
     
@@ -193,6 +197,7 @@ rbl {
         symbol = "RCVD_IN_DNSWL";
         rbl = "list.dnswl.org";
         ipv6 = true;
+        is_whitelist = true;
         returncodes {
             RCVD_IN_DNSWL_NONE = "127.0.%d+.0";
             RCVD_IN_DNSWL_LOW = "127.0.%d+.1";
@@ -210,6 +215,7 @@ rbl {
         exclude_users = false;
         exclude_private_ips = false;
         exclude_local = false;
+        ignore_whitelists = true;
     }
 
  }