Fix duplicated XBL symbol

diff --git a/conf/metrics.conf b/conf/metrics.conf
index 093d00e335865202c5d14648d37d2d3634b3d071..309fa15f5a4ebb36b2967ab1c67a27939bc7b739 100644 (file)
--- a/conf/metrics.conf
+++ b/conf/metrics.conf
@@ -568,15 +568,30 @@ metric {
            weight = 4.0;
            description = "From address is listed in zen xbl";
        }
+       symbol {
+           name = "RBL_SPAMHAUS_XBL1";
+           weight = 4.0;
+           description = "From address is listed in zen xbl (obsoleted/reserved)";
+       }
+       symbol {
+           name = "RBL_SPAMHAUS_XBL2";
+           weight = 4.0;
+           description = "From address is listed in zen xbl (obsoleted/reserved)";
+       }
+       symbol {
+           name = "RBL_SPAMHAUS_XBL3";
+           weight = 4.0;
+           description = "From address is listed in zen xbl (reserved)";
+       }
        symbol {
            name = "RBL_SPAMHAUS_PBL";
            weight = 2.0;
-           description = "From address is listed in zen pbl";
+           description = "From address is listed in zen pbl (ISP list)";
        }
        symbol {
            name = "RBL_SPAMHAUS_PBL1";
            weight = 2.0;
-           description = "From address is listed in zen pbl";
+           description = "From address is listed in zen pbl (Spamhaus list)";
        }
        symbol {
            name = "RECEIVED_SPAMHAUS_XBL";

diff --git a/conf/modules.d/rbl.conf b/conf/modules.d/rbl.conf
index 5e12be77449da0003f367a9b881ab5452a11680b..bcb47c4842243355f019862cbb85b0176e8b1980 100644 (file)
--- a/conf/modules.d/rbl.conf
+++ b/conf/modules.d/rbl.conf
@@ -15,9 +15,9 @@ rbl {
                 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_XBL1 = "127.0.0.5";
+                RBL_SPAMHAUS_XBL2 = "127.0.0.6";
+                RBL_SPAMHAUS_XBL3 = "127.0.0.7";
                 RBL_SPAMHAUS_PBL = "127.0.0.10";
                 RBL_SPAMHAUS_PBL1 = "127.0.0.11";
             }