diff options
| author | Mark Sapiro <mark@msapiro.net> | 2014-05-02 11:42:09 -0700 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2014-05-02 11:42:09 -0700 |
| commit | 094580a732b2b7f66c09cde3739421452db481fa (patch) | |
| tree | c2045fecddeb5598abeeeb92e168a44e9ae70c16 /Mailman/Handlers | |
| parent | a85eb84a1ca10b9a0348b5ba4483a41692b36e01 (diff) | |
| download | mailman2-094580a732b2b7f66c09cde3739421452db481fa.tar.gz mailman2-094580a732b2b7f66c09cde3739421452db481fa.tar.xz mailman2-094580a732b2b7f66c09cde3739421452db481fa.zip | |
More fine tuning of dmarc_moderation_action.
Diffstat (limited to 'Mailman/Handlers')
| -rw-r--r-- | Mailman/Handlers/Moderate.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py index 56acb4e4..55f5da21 100644 --- a/Mailman/Handlers/Moderate.py +++ b/Mailman/Handlers/Moderate.py @@ -50,10 +50,10 @@ class ModeratedMemberPost(Hold.ModeratedPost): def process(mlist, msg, msgdata): if msgdata.get('approved'): return - # Before anything else, check DMARC. + # Before anything else, check DMARC if necessary. msgdata['from_is_list'] = 0 dn, addr = parseaddr(msg.get('from')) - if addr: + if addr and mlist.dmarc_moderation_action > 0: if Utils.IsDMARCProhibited(addr): # Note that for dmarc_moderation_action, 0 = Accept, # 1 = Munge, 2 = Wrap, 3 = Reject, 4 = Discard |