aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Mailman/Utils.py7
-rw-r--r--NEWS3
2 files changed, 5 insertions, 5 deletions
diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index d2317b10..7bae2e6e 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -1273,10 +1273,7 @@ def _DMARCProhibited(mlist, email, dmarc_domain, org=False):
email, dmarc_domain, e.__doc__)
return 'continue'
else:
-# people are already being dumb, don't trust them to provide honest DNS
-# where the answer section only contains what was asked for, nor to include
-# CNAMEs before the values they point to.
- full_record = ""
+ # Be as robust as possible in parsing the result.
results_by_name = {}
cnames = {}
want_names = set([dmarc_domain + '.'])
@@ -1316,7 +1313,7 @@ def _DMARCProhibited(mlist, email, dmarc_domain, org=False):
syslog('error',
"""RRset of TXT records for %s has %d v=DMARC1 entries;
testing them all""",
- dmarc_domain, len(dmarc))
+ dmarc_domain, len(dmarcs))
for entry in dmarcs:
mo = re.search(r'\bsp=(\w*)\b', entry, re.IGNORECASE)
if org and mo:
diff --git a/NEWS b/NEWS
index 3f06cead..5ea05a7d 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,9 @@ Here is a history of user visible changes to Mailman.
Bug fixes and other patches
+ - Fixed a typo in Utils.py that could have resulted in a NameError in
+ logging an unlikely occurrence. (LP: #1637745)
+
- Fixed a bug which created incorrect "view more members" links at the
bottom of the admin Membership List pages. (LP: #1637061)