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

diff --git a/conf/composites.conf b/conf/composites.conf
index e2096b29113d98240ac2876e08e485968272e0a6..de09f0c90258dd5d37a06b7b32542fbf92e58a8d 100644 (file)
--- 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 653ae80574709083d38b6ef692888515be4c7714..7fd13b06fe752913a0e9fffc496a8cf68992dcc2 100644 (file)
--- 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;