diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-11-14 16:13:01 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-11-14 16:13:01 +0900 |
| commit | bbbb6d56477ec5a8be22a2b999ea40b93a84498f (patch) | |
| tree | b5f52b82df2ab6034156acb743ec08ccf4bf73af /Mailman/Utils.py | |
| parent | eda2cc91d4e0332df8ee2ecae8aa9fdbc7e68809 (diff) | |
| parent | 5b7885a8666e980b6d8299ae32d6131de83b66c4 (diff) | |
| download | mailman2-bbbb6d56477ec5a8be22a2b999ea40b93a84498f.tar.gz mailman2-bbbb6d56477ec5a8be22a2b999ea40b93a84498f.tar.xz mailman2-bbbb6d56477ec5a8be22a2b999ea40b93a84498f.zip | |
merge lp:mailman/2.1 up to rev 1682
Diffstat (limited to 'Mailman/Utils.py')
| -rw-r--r-- | Mailman/Utils.py | 7 |
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: |