aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2015-12-13 16:34:39 -0800
committerMark Sapiro <mark@msapiro.net>2015-12-13 16:34:39 -0800
commite56056f2296616d333eadd9c847b50456447dab8 (patch)
tree5b03770ca9f0a7f1d5209abb5ce472c3a89f110f
parent4e967acf9b45a6a6d24bc3d84c6d40f6dcffc1e8 (diff)
downloadmailman2-e56056f2296616d333eadd9c847b50456447dab8.tar.gz
mailman2-e56056f2296616d333eadd9c847b50456447dab8.tar.xz
mailman2-e56056f2296616d333eadd9c847b50456447dab8.zip
Vette log entries for banned subscriptions now include the source of
the request if available.
-rwxr-xr-xMailman/MailList.py8
-rwxr-xr-xNEWS2
2 files changed, 8 insertions, 2 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index b76dfa1f..0d47d812 100755
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -883,8 +883,12 @@ class MailList(HTMLFormatter, Deliverer, ListAdmin,
# Is the subscribing address banned from this list?
pattern = self.GetBannedPattern(email)
if pattern:
- syslog('vette', '%s banned subscription: %s (matched: %s)',
- realname, email, pattern)
+ if remote:
+ whence = ' from %s' % remote
+ else:
+ whence = ''
+ syslog('vette', '%s banned subscription: %s%s (matched: %s)',
+ realname, email, whence, pattern)
raise Errors.MembershipIsBanned, pattern
# Sanity check the digest flag
if digest and not self.digestable:
diff --git a/NEWS b/NEWS
index 94014633..254d6047 100755
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ Here is a history of user visible changes to Mailman.
de Mello.
Bug fixes and other patches
+ - Vette log entries for banned subscriptions now include the source of
+ the request if available. (LP: #1525733)
- Submitting the user options form for a user who was asynchronously
unsubscribed would throw an uncaught NotAMemberError. (LP: #1523273)