diff options
| author | Mark Sapiro <msapiro@value.net> | 2014-04-15 12:59:48 -0700 |
|---|---|---|
| committer | Mark Sapiro <msapiro@value.net> | 2014-04-15 12:59:48 -0700 |
| commit | 0d9b1cce5e97fe4095fe2cb72465129437d83b5a (patch) | |
| tree | 91ac47389801b2c5c5bb67bbae8a5f45f4f05b0b /Mailman/Handlers/CleanseDKIM.py | |
| parent | 192caa4943eb87e466229736eccefd4381042fd7 (diff) | |
| parent | f00ecb3432578156b7f9df2ae33ad5f840e20de6 (diff) | |
| download | mailman2-0d9b1cce5e97fe4095fe2cb72465129437d83b5a.tar.gz mailman2-0d9b1cce5e97fe4095fe2cb72465129437d83b5a.tar.xz mailman2-0d9b1cce5e97fe4095fe2cb72465129437d83b5a.zip | |
Added and modified various options regarding DMARC. See the NEWS file.
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Handlers/CleanseDKIM.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Mailman/Handlers/CleanseDKIM.py b/Mailman/Handlers/CleanseDKIM.py index 0df2d97f..5a83a2e0 100644 --- a/Mailman/Handlers/CleanseDKIM.py +++ b/Mailman/Handlers/CleanseDKIM.py @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2013 by the Free Software Foundation, Inc. +# Copyright (C) 2006-2014 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 @@ -31,11 +31,12 @@ from Mailman import mm_cfg def process(mlist, msg, msgdata): if not mm_cfg.REMOVE_DKIM_HEADERS: return - if (mm_cfg.ALLOW_FROM_IS_LIST and - mm_cfg.REMOVE_DKIM_HEADERS == 1 and - mlist.from_is_list != 1): - return - del msg['domainkey-signature'] - del msg['dkim-signature'] - del msg['authentication-results'] + if (mm_cfg.REMOVE_DKIM_HEADERS == 1 and + (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'] |