aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Handlers
diff options
context:
space:
mode:
authorYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2016-05-27 13:24:56 +0900
committerYasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>2016-05-27 13:24:56 +0900
commit1b15d9c70316f03333f83ad5987462745e6860fa (patch)
tree19d6f870817729cc130e8e87b96a8d69469da13d /Mailman/Handlers
parent6aba267b47a6db8ca28d805724b25f11dfcf29e4 (diff)
parentc08fa7a5a3379f6ac9d534fa781fa46de17ff90e (diff)
downloadmailman2-1b15d9c70316f03333f83ad5987462745e6860fa.tar.gz
mailman2-1b15d9c70316f03333f83ad5987462745e6860fa.tar.xz
mailman2-1b15d9c70316f03333f83ad5987462745e6860fa.zip
Merge lp:mailman/2.1 rev 1655, rev 1656
Diffstat (limited to '')
-rw-r--r--Mailman/Handlers/CleanseDKIM.py9
1 files changed, 8 insertions, 1 deletions
diff --git a/Mailman/Handlers/CleanseDKIM.py b/Mailman/Handlers/CleanseDKIM.py
index 2cfb07af..3e70313b 100644
--- a/Mailman/Handlers/CleanseDKIM.py
+++ b/Mailman/Handlers/CleanseDKIM.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2015 by the Free Software Foundation, Inc.
+# Copyright (C) 2006-2016 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -43,6 +43,13 @@ def process(mlist, msg, msgdata):
)
):
return
+ if (mm_cfg.REMOVE_DKIM_HEADERS == 3):
+ for value in msg.get_all('domainkey-signature', []):
+ msg['X-Mailman-Original-DomainKey-Signature'] = value
+ for value in msg.get_all('dkim-signature', []):
+ msg['X-Mailman-Original-DKIM-Signature'] = value
+ for value in msg.get_all('authentication-results', []):
+ msg['X-Mailman-Original-Authentication-Results'] = value
del msg['domainkey-signature']
del msg['dkim-signature']
del msg['authentication-results']