diff options
Diffstat (limited to 'Mailman')
| -rw-r--r-- | Mailman/Cgi/subscribe.py | 1 | ||||
| -rwxr-xr-x | Mailman/Defaults.py.in | 4 | ||||
| -rw-r--r-- | Mailman/Handlers/Scrubber.py | 3 | ||||
| -rw-r--r-- | Mailman/Version.py | 4 |
4 files changed, 9 insertions, 3 deletions
diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py index 795fc81b..ca218737 100644 --- a/Mailman/Cgi/subscribe.py +++ b/Mailman/Cgi/subscribe.py @@ -300,6 +300,7 @@ moderator's decision when they get to your request.""") results = _('You are already subscribed.') else: results = privacy_results + if privacy_results and mm_cfg.WARN_MEMBER_OF_SUBSCRIBE: # This could be a membership probe. For safety, let the user know # a probe occurred. BAW: should we inform the list moderator? listaddr = mlist.GetListEmail() diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in index e5d8b3cf..fea5dcf1 100755 --- a/Mailman/Defaults.py.in +++ b/Mailman/Defaults.py.in @@ -1130,6 +1130,10 @@ ANONYMOUS_LIST_KEEP_HEADERS = ['^(?!x-)', '^x-mailman-', # request email, she has to wait PENDING_REQUEST_LIFE (default 3 days) before # she can request another. This setting also applies to repeated unsubscribes. REFUSE_SECOND_PENDING = No +# Mailbombing of a list member of a list with private rosters can occur with +# repeated subscribe attempts resulting in repeated user warnings. Set the +# following to No to supress the user warnings. +WARN_MEMBER_OF_SUBSCRIBE = Yes diff --git a/Mailman/Handlers/Scrubber.py b/Mailman/Handlers/Scrubber.py index 97e443b7..cecd11fb 100644 --- a/Mailman/Handlers/Scrubber.py +++ b/Mailman/Handlers/Scrubber.py @@ -471,7 +471,8 @@ def save_attachment(mlist, msg, dir, filter_html=True): # guessed so attachments can't lie about their type. Also, if the # filename /has/ no extension, then tack on the one we guessed. # The extension was removed from the name above. - filebase = filename + # Allow for extra and ext and keep it under 255 bytes. + filebase = filename[:240] # Now we're looking for a unique name for this file on the file # system. If msgdir/filebase.ext isn't unique, we'll add a counter # after filebase, e.g. msgdir/filebase-cnt.ext diff --git a/Mailman/Version.py b/Mailman/Version.py index af7d8085..23562c06 100644 --- a/Mailman/Version.py +++ b/Mailman/Version.py @@ -16,7 +16,7 @@ # USA. # Mailman version -VERSION = '2.1.33' +VERSION = '2.1.34' # 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 = 33 +MICRO_REV = 34 REL_LEVEL = FINAL # at most 15 beta releases! REL_SERIAL = 0 |