← Back to branch summary

~mailman-coders/mailman/2.1

« back to all changes in this revision

Viewing changes to Mailman/Handlers/Moderate.py

  • Committer: Mark Sapiro
  • Date: 2014-05-03 03:26:03 UTC
  • Revision ID: mark@msapiro.net-20140503032603-np173tdb7b38efyh
Make dmarc_quarantine_moderaction_action a list setting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Mailman/Handlers/Moderate.py
54
54
    msgdata['from_is_list'] = 0
55
55
    dn, addr = parseaddr(msg.get('from'))
56
56
    if addr and mlist.dmarc_moderation_action > 0:
57
 
        if Utils.IsDMARCProhibited(addr):
 
57
        if Utils.IsDMARCProhibited(mlist, addr):
58
58
            # Note that for dmarc_moderation_action, 0 = Accept, 
59
59
            #    1 = Munge, 2 = Wrap, 3 = Reject, 4 = Discard
60
60
            if mlist.dmarc_moderation_action == 1: