- 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)

3 files changed, 10 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']
 
diff --git a/NEWS b/NEWS
index 445174a2..0d1d0f40 100755
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,11 @@ Here is a history of user visible changes to Mailman.
 
   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
diff --git a/messages/sr/readme.sr b/messages/sr/README.sr
index df7eef0e..df7eef0e 100644
--- a/messages/sr/readme.sr
+++ b/messages/sr/README.sr