diff options
| author | Mark Sapiro <mark@msapiro.net> | 2014-05-02 20:26:03 -0700 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2014-05-02 20:26:03 -0700 |
| commit | d8d784da666f6cd366f08a2a87bff73b3762e3fd (patch) | |
| tree | 381b872307f46226eb6f5e54ccad8735bf902462 /Mailman/Utils.py | |
| parent | 094580a732b2b7f66c09cde3739421452db481fa (diff) | |
| download | mailman2-d8d784da666f6cd366f08a2a87bff73b3762e3fd.tar.gz mailman2-d8d784da666f6cd366f08a2a87bff73b3762e3fd.tar.xz mailman2-d8d784da666f6cd366f08a2a87bff73b3762e3fd.zip | |
Make dmarc_quarantine_moderaction_action a list setting.
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Utils.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Mailman/Utils.py b/Mailman/Utils.py index eab085a8..8290bf14 100644 --- a/Mailman/Utils.py +++ b/Mailman/Utils.py @@ -1068,7 +1068,7 @@ def suspiciousHTML(html): # This takes an email address, and returns True if DMARC policy is p=reject # or possibly quarantine. -def IsDMARCProhibited(email): +def IsDMARCProhibited(mlist, email): if not dns_resolver: return False @@ -1142,7 +1142,7 @@ def IsDMARCProhibited(email): email, dmarc_domain, name, entry) return True - if (mm_cfg.DMARC_QUARANTINE_MODERATION_ACTION and + if (mlist.dmarc_quarantine_moderation_action and re.search(r'\bp=quarantine\b', entry, re.IGNORECASE)): syslog('vette', 'DMARC lookup for %s (%s) found p=quarantine in %s = %s', @@ -1151,4 +1151,3 @@ def IsDMARCProhibited(email): return False - |