diff options
| author | Jim Popovitch <jimpop@domainmail.org> | 2018-11-30 22:53:02 +0000 |
|---|---|---|
| committer | Jim Popovitch <jimpop@domainmail.org> | 2018-11-30 22:53:02 +0000 |
| commit | a6a9e9960a6e300630ee46b04831850d0bfec50d (patch) | |
| tree | f1005e523d0598e6cd5e6ba1cccf39df8c4dcab5 /Mailman/Handlers | |
| parent | d03507def644416adf753098173220be6f75c137 (diff) | |
| download | mailman2-a6a9e9960a6e300630ee46b04831850d0bfec50d.tar.gz mailman2-a6a9e9960a6e300630ee46b04831850d0bfec50d.tar.xz mailman2-a6a9e9960a6e300630ee46b04831850d0bfec50d.zip | |
Patch for dmarc_moderation_addresses to automatically apply dmarc_moderation_action against a regexp of addresess
Diffstat (limited to 'Mailman/Handlers')
| -rw-r--r-- | Mailman/Handlers/SpamDetect.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Mailman/Handlers/SpamDetect.py b/Mailman/Handlers/SpamDetect.py index 7e035184..73fc758f 100644 --- a/Mailman/Handlers/SpamDetect.py +++ b/Mailman/Handlers/SpamDetect.py @@ -109,7 +109,7 @@ def process(mlist, msg, msgdata): msgdata['from_is_list'] = 0 dn, addr = parseaddr(msg.get('from')) if addr and mlist.dmarc_moderation_action > 0: - if Utils.IsDMARCProhibited(mlist, addr): + if mlist.GetPattern(addr, mlist.dmarc_moderation_addresses, at_list='dmarc_moderation_addresses') or Utils.IsDMARCProhibited(mlist, addr): # Note that for dmarc_moderation_action, 0 = Accept, # 1 = Munge, 2 = Wrap, 3 = Reject, 4 = Discard if mlist.dmarc_moderation_action == 1: |