Fix XBL composite to avoid duplicate symbols

diff --git a/conf/composites.conf b/conf/composites.conf
index 0c8e0d4e87f9f0947119207b991c776dc895eefa..6fc4a25bcf28100db4fb6c3fd56c42b3003e9f3f 100644 (file)
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@ -13,6 +13,6 @@ composite {
     expression = "g:mua and -MAILLIST";
 }
 composite {
-    name = "RBL_SPAMHAUS_XBL";
-    expression = "-RBL_SPAMHAUS_XBL & RECEIVED_SPAMHAUS_XBL";
+    name = "RBL_SPAMHAUS_XBL_ANY";
+    expression = "(-RBL_SPAMHAUS_XBL | -RBL_SPAMHAUS_XBL1 | -RBL_SPAMHAUS_XBL2 | -RBL_SPAMHAUS_XBL3) & RECEIVED_SPAMHAUS_XBL";
 }

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 309fa15f5a4ebb36b2967ab1c67a27939bc7b739..41dca78adb13634140dbdf740c596ac33d76d359 100644 (file)
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -583,6 +583,11 @@ metric {
            weight = 4.0;
            description = "From address is listed in zen xbl (reserved)";
        }
+       symbol {
+           name = "RBL_SPAMHAUS_XBL_ANY";
+           weight = 4.0;
+           description = "From or receive address is listed in zen xbl (any list)";
+       }
        symbol {
            name = "RBL_SPAMHAUS_PBL";
            weight = 2.0;