aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Gui
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2016-02-02 12:17:20 -0800
committerMark Sapiro <mark@msapiro.net>2016-02-02 12:17:20 -0800
commit87dee93764ce849ad0a454252e5de466a4cb693f (patch)
tree3bac24c34714a75fb84afdeee02ef86bd5dba2d8 /Mailman/Gui
parent7470e5f55f1a951f6905bb79c5d1b962888a2f89 (diff)
downloadmailman2-87dee93764ce849ad0a454252e5de466a4cb693f.tar.gz
mailman2-87dee93764ce849ad0a454252e5de466a4cb693f.tar.xz
mailman2-87dee93764ce849ad0a454252e5de466a4cb693f.zip
Added dmarc_non_moderation_action to list settings.
Diffstat (limited to 'Mailman/Gui')
-rw-r--r--Mailman/Gui/Privacy.py19
1 files changed, 19 insertions, 0 deletions
diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py
index 668140e8..e500908d 100644
--- a/Mailman/Gui/Privacy.py
+++ b/Mailman/Gui/Privacy.py
@@ -329,6 +329,25 @@ class Privacy(GUIBase):
the message will likely not bounce, but will be delivered to
recipients' spam folders or other hard to find places.""")),
+ ('dmarc_none_moderation_action', mm_cfg.Radio,
+ (_('No'), _('Yes')), 0,
+ _("""Shall the above dmarc_moderation_action apply to messages
+ From: domains with DMARC p=none as well as p=quarantine and
+ p=reject"""),
+
+ _("""<ul><li><b>No</b> -- this applies dmarc_moderation_action to
+ only those posts From: a domain with DMARC p=reject and
+ possibly p=quarantine depending on the setting of
+ dmarc_quarantine_moderation_action.
+ <p><li><b>Yes</b> -- this applies dmarc_moderation_action to
+ posts From: a domain with DMARC p=none if
+ dmarc_moderation_action is Munge From or Wrap Message and
+ dmarc_quarantine_moderation_action is Yes.
+ <p>The intent of this setting is to eliminate failure reports
+ to the owner of a domain that publishes DMARC p=none by applying
+ the message transformations that would be applied if the
+ domain's DMARC policy were stronger.""")),
+
('dmarc_moderation_notice', mm_cfg.Text, (10, WIDTH), 1,
_("""Text to include in any
<a href="?VARHELP=privacy/sender/dmarc_moderation_action"