------------------------------------------------------------
revno: 1353
committer: Mark Sapiro <m...@msapiro.net>
branch nick: 2.2
timestamp: Fri 2014-09-05 14:26:04 -0700
message:
- 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)
renamed:
messages/sr/readme.sr => messages/sr/README.sr
modified:
Mailman/Handlers/CleanseDKIM.py
NEWS
--
lp:mailman/2.2
https://code.launchpad.net/~mailman-coders/mailman/2.2
Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription
=== modified file 'Mailman/Handlers/CleanseDKIM.py'
--- Mailman/Handlers/CleanseDKIM.py 2014-04-15 20:55:52 +0000
+++ Mailman/Handlers/CleanseDKIM.py 2014-09-05 21:26:04 +0000
@@ -31,12 +31,13 @@
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']
=== modified file 'NEWS'
--- NEWS 2014-06-26 21:54:02 +0000
+++ NEWS 2014-09-05 21:26:04 +0000
@@ -67,6 +67,11 @@
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
=== renamed file 'messages/sr/readme.sr' => 'messages/sr/README.sr'
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
