aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman
diff options
context:
space:
mode:
authorJim Popovitch <jimpop@domainmail.org>2018-12-01 04:13:12 +0000
committerJim Popovitch <jimpop@domainmail.org>2018-12-01 04:13:12 +0000
commit3242707ec3214cb0ca9c639b99617f69f94f0d05 (patch)
treea04c00203b4a252d5a2f3c0e1e73263547efcc3a /Mailman
parenta6a9e9960a6e300630ee46b04831850d0bfec50d (diff)
downloadmailman2-3242707ec3214cb0ca9c639b99617f69f94f0d05.tar.gz
mailman2-3242707ec3214cb0ca9c639b99617f69f94f0d05.tar.xz
mailman2-3242707ec3214cb0ca9c639b99617f69f94f0d05.zip
Updated SpamDetect.py and VARHELP based on feedback from Mark S.
Diffstat (limited to 'Mailman')
-rw-r--r--Mailman/Gui/Privacy.py6
-rw-r--r--Mailman/Handlers/SpamDetect.py3
2 files changed, 6 insertions, 3 deletions
diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py
index e171389f..13d1f2e8 100644
--- a/Mailman/Gui/Privacy.py
+++ b/Mailman/Gui/Privacy.py
@@ -362,8 +362,10 @@ class Privacy(GUIBase):
>dmarc_moderation_action</a>
regardless of any domain specific DMARC Policy."""),
- _("""Postings from any of these members will automatically
- apply DMARC action mitigation.
+ _("""Postings from any of these addresses will automatically
+ apply any DMARC action mitigation. This can be utilized to
+ automatically wrap or munge postings from known addresses or
+ domains such as internal domains.
<p>Add member addresses one per line; start the line with a ^
character to designate a regular expression match.""")),
diff --git a/Mailman/Handlers/SpamDetect.py b/Mailman/Handlers/SpamDetect.py
index 73fc758f..cf41303f 100644
--- a/Mailman/Handlers/SpamDetect.py
+++ b/Mailman/Handlers/SpamDetect.py
@@ -109,7 +109,8 @@ 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 mlist.GetPattern(addr, mlist.dmarc_moderation_addresses, at_list='dmarc_moderation_addresses') or Utils.IsDMARCProhibited(mlist, addr):
+ if (mlist.GetPattern(addr, mlist.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: