diff options
| author | Mark Sapiro <mark@msapiro.net> | 2014-09-05 11:54:49 -0700 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2014-09-05 11:54:49 -0700 |
| commit | 1cb4d6eff03ad4001fce53a8cdbf2a436109d840 (patch) | |
| tree | 2dff4ec877f806cc1d917c49eb9ed52bed64bb72 /Mailman/Handlers | |
| parent | ddfc6686ce7ad6131a85e4f21ac1a1dca7a6e35a (diff) | |
| download | mailman2-1cb4d6eff03ad4001fce53a8cdbf2a436109d840.tar.gz mailman2-1cb4d6eff03ad4001fce53a8cdbf2a436109d840.tar.xz mailman2-1cb4d6eff03ad4001fce53a8cdbf2a436109d840.zip | |
- 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)
Diffstat (limited to 'Mailman/Handlers')
| -rw-r--r-- | Mailman/Handlers/CleanseDKIM.py | 9 |
1 files changed, 5 insertions, 4 deletions
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'] |