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 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Mailman/Handlers') 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'] -- cgit v1.2.3