From 1cb4d6eff03ad4001fce53a8cdbf2a436109d840 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Fri, 5 Sep 2014 11:54:49 -0700 Subject: - Fixed a bug which caused a setting of 2 for REMOVE_DKIM_HEADERS to be ignored. (LP: #1363278) - Renamed messages/sr/readme.sr to README.sr. (LP: #1360616) --- Mailman/Handlers/CleanseDKIM.py | 9 +++++---- NEWS | 5 +++++ messages/sr/README.sr | 6 ++++++ messages/sr/readme.sr | 6 ------ 4 files changed, 16 insertions(+), 10 deletions(-) create mode 100644 messages/sr/README.sr delete mode 100644 messages/sr/readme.sr diff --git a/Mailman/Handlers/CleanseDKIM.py b/Mailman/Handlers/CleanseDKIM.py index 5a83a2e0..2be1351a 100644 --- a/Mailman/Handlers/CleanseDKIM.py +++ b/Mailman/Handlers/CleanseDKIM.py @@ -31,12 +31,13 @@ from Mailman import mm_cfg def process(mlist, msg, msgdata): if not mm_cfg.REMOVE_DKIM_HEADERS: return - if (mm_cfg.REMOVE_DKIM_HEADERS == 1 and + if (mm_cfg.REMOVE_DKIM_HEADERS == 1 and not (msgdata.get('from_is_list') == 1 or (mlist.from_is_list == 1 and msgdata.get('from_is_list') != 2) ) ): - del msg['domainkey-signature'] - del msg['dkim-signature'] - del msg['authentication-results'] + return + del msg['domainkey-signature'] + del msg['dkim-signature'] + del msg['authentication-results'] diff --git a/NEWS b/NEWS index 445174a2..0d1d0f40 100755 --- a/NEWS +++ b/NEWS @@ -23,6 +23,11 @@ Here is a history of user visible changes to Mailman. Bug fixes and other patches + - Fixed a bug which caused a setting of 2 for REMOVE_DKIM_HEADERS to be + ignored. (LP: #1363278) + + - Renamed messages/sr/readme.sr to README.sr. (LP: #1360616) + - Moved the dmarc_moderation_action checks from the Moderate handler to the SpamDetect handler so that the Reject and Discard actions will be done before the message might be held by header_filter_rules, and the diff --git a/messages/sr/README.sr b/messages/sr/README.sr new file mode 100644 index 00000000..df7eef0e --- /dev/null +++ b/messages/sr/README.sr @@ -0,0 +1,6 @@ +Ово је бета-верзија пријевода Mailman-а. +Након завршетка ове (ијекавске) верзије, приступиће се изради и екавског пријевода. + +Молимо све са конструктивним приједлозима и критикама да се обрате на адресу bojan@trust-b.com. + + diff --git a/messages/sr/readme.sr b/messages/sr/readme.sr deleted file mode 100644 index df7eef0e..00000000 --- a/messages/sr/readme.sr +++ /dev/null @@ -1,6 +0,0 @@ -Ово је бета-верзија пријевода Mailman-а. -Након завршетка ове (ијекавске) верзије, приступиће се изради и екавског пријевода. - -Молимо све са конструктивним приједлозима и критикама да се обрате на адресу bojan@trust-b.com. - - -- cgit v1.2.3