From 6a615a1e6c6b3b03c3d8e334e6b097f29c9c975a Mon Sep 17 00:00:00 2001
From: Mark Sapiro <mark@msapiro.net>
Date: Wed, 4 May 2016 18:27:19 -0700
Subject: Allow DMARC_ORGANIZATIONAL_DOMAIN_DATA_URL to be None or the null
 string.

---
 Mailman/Utils.py | 2 ++
 NEWS             | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index 892bb5c8..2dbaef0b 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -1170,6 +1170,8 @@ def get_suffixes(url):
     global s_dict
     if s_dict:
         return
+    if not url:
+        return
     try:
         d = urllib2.urlopen(url)
     except urllib2.URLError, e:
diff --git a/NEWS b/NEWS
index 63cab408..e9939cde 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,9 @@ Here is a history of user visible changes to Mailman.
       (LP: #1572330)
 
   Bug fixes and other patches
+
+    - A site can now set DMARC_ORGANIZATIONAL_DOMAIN_DATA_URL to None or the
+      null string if it wants to avoid using this.  (LP: #1578450)
  
     - The white space to the left of the admindb Logout link is no longer
       part of the link.  (LP: #1573623)
-- 
cgit v1.2.3