From 00896ca733b6098f45f6f3cfb4edcc77ff9bb786 Mon Sep 17 00:00:00 2001
From: twesterhever <40121680+twesterhever@users.noreply.github.com>
Date: Fri, 17 Feb 2023 15:33:28 +0000
Subject: [PATCH] [Minor] Replace "Spamhaus XBL any" hack with a more clear
 solution

---
 conf/composites.conf         | 4 ----
 conf/scores.d/rbl_group.conf | 7 +------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/conf/composites.conf b/conf/composites.conf
index e2096b291..de09f0c90 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 653ae8057..7fd13b06f 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 ZEN 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 ZEN PBL (ISP list)";
@@ -139,7 +134,7 @@ symbols = {
         one_shot = true;
     }
     "RECEIVED_SPAMHAUS_XBL" {
-        weight = 3.0;
+        weight = 1.0;
         description = "Received address is listed in ZEN XBL";
         groups = ["spamhaus"];
         one_shot = true;
-- 
2.39.5