From 990f7226da9deb667e6b026ba7ae24ef728900c4 Mon Sep 17 00:00:00 2001
From: Jim Popovitch <jimpop@gmail.com>
Date: Sun, 3 Mar 2013 03:04:37 -0500
Subject: Hold/Reject/Discard moderation support for Senders with a DMARC
 p=reject policy

---
 Mailman/Gui/Privacy.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'Mailman/Gui')

diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py
index 75eff2b5..ae78b209 100644
--- a/Mailman/Gui/Privacy.py
+++ b/Mailman/Gui/Privacy.py
@@ -235,6 +235,30 @@ class Privacy(GUIBase):
              >rejection notice</a> to
              be sent to moderated members who post to this list.""")),
 
+            ('dmarc_moderation_action', mm_cfg.Radio,
+             (_('Hold'), _('Reject'), _('Discard')), 0,
+             _("""Action to take when anyone posts to the
+             list from a domain with a DMARC Reject Policy."""),
+             _("""<ul><li><b>Hold</b> -- this holds the message for approval
+             by the list moderators.
+
+             <p><li><b>Reject</b> -- this automatically rejects the message by
+             sending a bounce notice to the post's author.  The text of the
+             bounce notice can be <a
+             href="?VARHELP=privacy/sender/dmarc_moderation_notice"
+             >configured by you</a>.
+
+             <p><li><b>Discard</b> -- this simply discards the message, with
+             no notice sent to the post's author.
+             </ul>""")),
+
+            ('dmarc_moderation_notice', mm_cfg.Text, (10, WIDTH), 1,
+             _("""Text to include in any
+             <a href="?VARHELP/privacy/sender/dmarc_moderation_action"
+             >rejection notice</a> to
+             be sent to anyone who posts to this list from a domain
+             with DMARC Reject Policy.""")),
+
             _('Non-member filters'),
 
             ('accept_these_nonmembers', mm_cfg.EmailListEx, (10, WIDTH), 1,
-- 
cgit v1.2.3


From 80f14d7924d0a1b90873ecdc8388a10d31e440b3 Mon Sep 17 00:00:00 2001
From: Jim Popovitch <jimpop@gmail.com>
Date: Sun, 20 Oct 2013 21:55:48 +0000
Subject: Incorporated feedback from Mark S.

---
 Mailman/Gui/Privacy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Mailman/Gui')

diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py
index ae78b209..3e963b7a 100644
--- a/Mailman/Gui/Privacy.py
+++ b/Mailman/Gui/Privacy.py
@@ -236,7 +236,7 @@ class Privacy(GUIBase):
              be sent to moderated members who post to this list.""")),
 
             ('dmarc_moderation_action', mm_cfg.Radio,
-             (_('Hold'), _('Reject'), _('Discard')), 0,
+             (_('Accept'), _('Hold'), _('Reject'), _('Discard')), 0,
              _("""Action to take when anyone posts to the
              list from a domain with a DMARC Reject Policy."""),
              _("""<ul><li><b>Hold</b> -- this holds the message for approval
-- 
cgit v1.2.3


From bc05ad4e81bd2ce9ec0f36e5112eadf607a49195 Mon Sep 17 00:00:00 2001
From: Jim Popovitch <jimpop@gmail.com>
Date: Fri, 8 Nov 2013 00:56:42 +0000
Subject: Added suuport for p=quarantine based on feedback from Franck Martin.

---
 Mailman/Gui/Privacy.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Mailman/Gui')

diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py
index 3e963b7a..90560bff 100644
--- a/Mailman/Gui/Privacy.py
+++ b/Mailman/Gui/Privacy.py
@@ -238,7 +238,7 @@ class Privacy(GUIBase):
             ('dmarc_moderation_action', mm_cfg.Radio,
              (_('Accept'), _('Hold'), _('Reject'), _('Discard')), 0,
              _("""Action to take when anyone posts to the
-             list from a domain with a DMARC Reject Policy."""),
+             list from a domain with a DMARC Reject/Quarantine Policy."""),
              _("""<ul><li><b>Hold</b> -- this holds the message for approval
              by the list moderators.
 
@@ -257,7 +257,7 @@ class Privacy(GUIBase):
              <a href="?VARHELP/privacy/sender/dmarc_moderation_action"
              >rejection notice</a> to
              be sent to anyone who posts to this list from a domain
-             with DMARC Reject Policy.""")),
+             with DMARC Reject/Quarantine Policy.""")),
 
             _('Non-member filters'),
 
-- 
cgit v1.2.3