Improve spamhaus RBL support.

Submitted by: AL

conf/metrics.conf

@@ -322,21 +322,12 @@ metric {
         description = "One received header with 'bad' patterns inside";
         name = "ONCE_RECEIVED_STRICT";
     }
-    symbol {
-        weight = 2.0;
-        description = "From address is listed in zen spamhaus BL";
-        name = "RBL_ZEN";
-    }
-    symbol {
-        weight = 3.0;
-        description = "Received headers contains addresses from XBL spamhaus RBL";
-        name = "RBL_XBL";
-    }
-    symbol {
-        weight = 2.0;
-        description = "Received headers contains addresses from PBL spamhaus RBL";
-        name = "RBL_PBL";
-    }
+    symbol { name = "RBL_SPAMHAUS"; weight = 0.0; description = "From address is listed in zen"; }
+    symbol { name = "RBL_SPAMHAUS_SBL"; weight = 2.0; description = "From address is listed in zen sbl"; }
+    symbol { name = "RBL_SPAMHAUS_CSS"; weight = 2.0; description = "From address is listed in zen css"; }
+    symbol { name = "RBL_SPAMHAUS_XBL"; weight = 4.0; description = "From address is listed in zen xbl"; }
+    symbol { name = "RBL_SPAMHAUS_PBL"; weight = 2.0; description = "From address is listed in zen pbl"; }
+    symbol { name = "RECEIVED_SPAMHAUS_XBL"; weight = 3.0; description = "Received address is listed in zen pbl"; }
     symbol {
         weight = 2.0;
         description = "From address is listed in senderscore.com BL";

conf/modules.conf

@@ -71,28 +71,34 @@ rbl {
     default_from = true;
 
     rbls {
-    spamhaus_zen {
-       symbol = "RBL_ZEN";
-       rbl = "zen.spamhaus.org";
-       ipv4 = true;
-       ipv6 = true;
-    }
-    spamhaus_pbl {
-       symbol = "RECEIVED_PBL";
-       rbl = "pbl.spamhaus.org";
-       ipv4 = true;
-       ipv6 = true;
-       received = true;
-       from = false;
-    }
+	
+	spamhaus {
+		symbol = "RBL_SPAMHAUS";
+		rbl = "zen.spamhaus.org";
+		ipv4 = true;
+		ipv6 = true;
+		unknown = false;
+		returncodes {
+		RBL_SPAMHAUS_SBL = "127.0.0.2";
+		RBL_SPAMHAUS_CSS = "127.0.0.3";
+		RBL_SPAMHAUS_XBL = "127.0.0.4";
+		RBL_SPAMHAUS_XBL = "127.0.0.5";
+		RBL_SPAMHAUS_XBL = "127.0.0.6";
+		RBL_SPAMHAUS_XBL = "127.0.0.7";
+		RBL_SPAMHAUS_PBL = "127.0.0.10";
+		RBL_SPAMHAUS_PBL = "127.0.0.11";
+		}
+	}
+
     spamhaus_xbl {
-       symbol = "RECEIVED_XBL";
+       symbol = "RECEIVED_SPAMHAUS_XBL";
        rbl = "xbl.spamhaus.org";
        ipv4 = true;
        ipv6 = true;
        received = true;
        from = false;
     }
+
     mailspike {
        symbol = "RBL_MAILSPIKE";
        rbl = "bl.mailspike.net";