aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mailman/Handlers/Moderate.py6
-rw-r--r--Mailman/Version.py4
-rwxr-xr-xNEWS10
3 files changed, 14 insertions, 6 deletions
diff --git a/Mailman/Handlers/Moderate.py b/Mailman/Handlers/Moderate.py
index 9b5f0600..884030de 100644
--- a/Mailman/Handlers/Moderate.py
+++ b/Mailman/Handlers/Moderate.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2011 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 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
@@ -47,7 +47,7 @@ class ModeratedMemberPost(Hold.ModeratedPost):
def process(mlist, msg, msgdata):
- if msgdata.get('approved') or msgdata.get('fromusenet'):
+ if msgdata.get('approved'):
return
# First of all, is the poster a member or not?
for sender in msg.get_senders():
@@ -124,7 +124,7 @@ def process(mlist, msg, msgdata):
# moderation configuration variables. Handle by way of generic non-member
# action.
assert 0 <= mlist.generic_nonmember_action <= 4
- if mlist.generic_nonmember_action == 0:
+ if mlist.generic_nonmember_action == 0 or msgdata.get('fromusenet'):
# Accept
return
elif mlist.generic_nonmember_action == 1:
diff --git a/Mailman/Version.py b/Mailman/Version.py
index 1df71cdd..8897164f 100644
--- a/Mailman/Version.py
+++ b/Mailman/Version.py
@@ -16,7 +16,7 @@
# USA.
# Mailman version
-VERSION = '2.1.16'
+VERSION = '2.1.17'
# And as a hex number in the manner of PY_VERSION_HEX
ALPHA = 0xa
@@ -28,7 +28,7 @@ FINAL = 0xf
MAJOR_REV = 2
MINOR_REV = 1
-MICRO_REV = 16
+MICRO_REV = 17
REL_LEVEL = FINAL
# at most 15 beta releases!
REL_SERIAL = 0
diff --git a/NEWS b/NEWS
index 2b23931a..0b939972 100755
--- a/NEWS
+++ b/NEWS
@@ -5,10 +5,18 @@ Copyright (C) 1998-2011 by the Free Software Foundation, Inc.
Here is a history of user visible changes to Mailman.
-2.1.17 (xx-xxx-xxxx)
+2.1.17 (23-Nov-2013)
New Features
+ - Handling of posts gated from usenet to a list via the Mail <-> News
+ gateway is changed. Formerly, no list membership, moderation or
+ *_these_nonmembers checks were done. Now, if the sender of the usenet
+ post is a moderated member or a nonmember matching a *_these_nonmembers
+ filter, those checks will be done and actions applied. Nonmember posts
+ from senders not matching a *_these_nonmembers filter are still accepted
+ as before. (LP: #1252575)
+
- There is a new mm_cfg.py setting ANONYMOUS_LIST_KEEP_HEADERS. Since it
is not possible to know which non-standard headers in a message might
reveal sender information, we now remove all headers from incoming posts