From 094580a732b2b7f66c09cde3739421452db481fa Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Fri, 2 May 2014 11:42:09 -0700 Subject: More fine tuning of dmarc_moderation_action. --- Mailman/Handlers/Moderate.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Mailman/Handlers') 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 -- cgit v1.2.3