aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2016-10-29 10:05:15 -0700
committerMark Sapiro <mark@msapiro.net>2016-10-29 10:05:15 -0700
commit2354e5108bde36f90c6c8d8731b811d540bc3371 (patch)
treeefccd543f4cfbccde09a0132b2a4a7db1e6e0149 /Mailman
parent662f43897a36654177b351ffa2075d6a8039dd5b (diff)
downloadmailman2-2354e5108bde36f90c6c8d8731b811d540bc3371.tar.gz
mailman2-2354e5108bde36f90c6c8d8731b811d540bc3371.tar.xz
mailman2-2354e5108bde36f90c6c8d8731b811d540bc3371.zip
Fixed a typo and deleted an unreferenced assignment.
Diffstat (limited to 'Mailman')
-rw-r--r--Mailman/Utils.py7
1 files changed, 2 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: