aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2017-09-22 08:22:42 -0700
committerMark Sapiro <mark@msapiro.net>2017-09-22 08:22:42 -0700
commitf48f75cccf27cdd098cb5c5e0f8c063361f80c1e (patch)
tree9a5c9c54387f36c9973998ee66d99c0fd4d538c7
parent7c3207ca991ee5723ff7c656d00f263d82b3f480 (diff)
downloadmailman2-f48f75cccf27cdd098cb5c5e0f8c063361f80c1e.tar.gz
mailman2-f48f75cccf27cdd098cb5c5e0f8c063361f80c1e.tar.xz
mailman2-f48f75cccf27cdd098cb5c5e0f8c063361f80c1e.zip
The default DMARC reject reason now properly replaces %(listowner)s.
-rw-r--r--Mailman/Handlers/SpamDetect.py1
-rw-r--r--NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Mailman/Handlers/SpamDetect.py b/Mailman/Handlers/SpamDetect.py
index aaddff5f..257cdb24 100644
--- a/Mailman/Handlers/SpamDetect.py
+++ b/Mailman/Handlers/SpamDetect.py
@@ -117,6 +117,7 @@ def process(mlist, msg, msgdata):
if text:
text = Utils.wrap(text)
else:
+ listowner = mlist.GetOwnerEmail()
text = Utils.wrap(_(
"""You are not allowed to post to this mailing list From: a domain which
publishes a DMARC policy of reject or quarantine, and your message has been
diff --git a/NEWS b/NEWS
index 8f3181af..7dc0571f 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,9 @@ Here is a history of user visible changes to Mailman.
Bug fixes and other patches
+ - The default DMARC reject reason now properly replaces %(listowner)s.
+ (LP: #1718962)
+
- The web roster page now shows case preserved email addresses.
(LP: #1707447)