From 96dd7c7b5133e629ff9bdf62ff189202cc637b05 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Wed, 16 Apr 2014 12:06:44 -0700 Subject: Reordered Munge/Wrap DMARC moderation policy options so site admins can allow Wrap but not Munge. --- Mailman/Handlers/Moderate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Mailman/Handlers') diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py index d901eb59..56acb4e4 100644 --- a/Mailman/Handlers/Moderate.py +++ b/Mailman/Handlers/Moderate.py @@ -56,11 +56,11 @@ def process(mlist, msg, msgdata): if addr: if Utils.IsDMARCProhibited(addr): # Note that for dmarc_moderation_action, 0 = Accept, - # 1 = Wrap, 2 = Munge, 3 = Reject, 4 = Discard + # 1 = Munge, 2 = Wrap, 3 = Reject, 4 = Discard if mlist.dmarc_moderation_action == 1: - msgdata['from_is_list'] = 2 - elif mlist.dmarc_moderation_action == 2: msgdata['from_is_list'] = 1 + elif mlist.dmarc_moderation_action == 2: + msgdata['from_is_list'] = 2 elif mlist.dmarc_moderation_action == 3: # Reject text = mlist.dmarc_moderation_notice -- cgit v1.2.3