From a8715a7afa8fd36d9118df834b3e8749b0083972 Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
Date: Mon, 4 Jun 2018 19:19:31 -0700
Subject: Restrict Spamhaus ZEN hits to SBL, CSS and XBL.

---
 Mailman/Defaults.py.in | 4 ++--
 Mailman/Utils.py       | 2 +-
 NEWS                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index a124832d..7a86f63c 100755
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -146,8 +146,8 @@ RECAPTCHA_SECRET_KEY = None
 GLOBAL_BAN_LIST = []
 
 # IF the following is set to Yes, and a web subscribe comes from an IPv4
-# address and the IP is listed in Spamhaus ZEN, the subscription will be
-# blocked.
+# address and the IP is listed in Spamhaus SBL, CSS or XBL, the subscription
+# will be blocked.
 BLOCK_SPAMHAUS_LISTED_IP_SUBSCRIBE = No
 
 # Command that is used to convert text/html parts into plain text.  This
diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index 2f9bda63..cdc82366 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -1513,6 +1513,6 @@ def banned_ip(ip):
     if not ans:
         return False
     text = ans.rrset.to_text()
-    if re.search(r'127\.0\.0\.\d{1,2}$', text, re.MULTILINE):
+    if re.search(r'127\.0\.0\.[2-7]$', text, re.MULTILINE):
         return True
     return False
diff --git a/NEWS b/NEWS
index 3d59db2e..ff4debae 100644
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@ Here is a history of user visible changes to Mailman.
 
     - A new BLOCK_SPAMHAUS_LISTED_IP_SUBSCRIBE setting has been added to
       enable blocking web subscribes from IPv4 addresses listed in Spamhaus
-      ZEN.
+      SBL, CSS or XBL.
 
   i18n
 
-- 
cgit v1.2.3