From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Sun, 19 Feb 2023 23:20:56 +0000 (+0000)
Subject: Merge branch 'master' into temp-propose-alternative-solution-to-xbl-any-hack
X-Git-Tag: 3.5~43^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4398%2Fhead;p=thirdparty%2Frspamd.git

Merge branch 'master' into temp-propose-alternative-solution-to-xbl-any-hack
---

1e27c46e5d929f660810e60505db059c2c81b79d
diff --cc conf/scores.d/rbl_group.conf
index 7fd13b06fe,40b68c947e..e24d7d14cc
--- a/conf/scores.d/rbl_group.conf
+++ b/conf/scores.d/rbl_group.conf
@@@ -98,12 -98,17 +98,12 @@@ symbols = 
      }
      "RBL_SPAMHAUS_XBL" {
          weight = 4.0;
-         description = "From address is listed in ZEN XBL";
+         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 ZEN PBL (ISP list)";
+         description = "From address is listed in Spamhaus PBL";
          groups = ["spamhaus"];
      }
      "RBL_SPAMHAUS_DROP" {