Merge pull request #4398 from twesterhever/temp-propose-alternative-solution-to-xbl-any-hack

[Minor] Replace "Spamhaus XBL any" hack with a more clear solution

2 files changed, 2 insertions, 11 deletions

diff --git a/conf/composites.conf b/conf/composites.conf
index 82373b093..db2cba1fe 100644
--- a/conf/composites.conf
+++ b/conf/composites.conf
@@ -45,10 +45,6 @@ composites {
   FORGED_MUA_MAILLIST {
     expression = "g:mua & -MAILLIST";
   }
-  RBL_SPAMHAUS_XBL_ANY {
-    expression = "RBL_SPAMHAUS_XBL & RECEIVED_SPAMHAUS_XBL";
-    description = "From and Received address are listed in Spamhaus XBL";
-  }
   AUTH_NA {
     expression = "R_DKIM_NA & R_SPF_NA & DMARC_NA & ARC_NA";
     score = 1.0;
diff --git a/conf/scores.d/rbl_group.conf b/conf/scores.d/rbl_group.conf
index 40b68c947..e24d7d14c 100644
--- a/conf/scores.d/rbl_group.conf
+++ b/conf/scores.d/rbl_group.conf
@@ -101,11 +101,6 @@ symbols = {
         description = "From address is listed in Spamhaus XBL";
         groups = ["spamhaus"];
     }
-    "RBL_SPAMHAUS_XBL_ANY" {
-        weight = 4.0;
-        description = "From or received address is listed in ZEN XBL (any list)";
-        groups = ["spamhaus"];
-    }
     "RBL_SPAMHAUS_PBL" {
         weight = 2.0;
         description = "From address is listed in Spamhaus PBL";
@@ -139,8 +134,8 @@ symbols = {
         one_shot = true;
     }
     "RECEIVED_SPAMHAUS_XBL" {
-        weight = 3.0;
-        description = "Received address is listed in Spamhaus XBL";
+        weight = 1.0;
+        description = "Received address is listed in ZEN XBL";
         groups = ["spamhaus"];
         one_shot = true;
     }