aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mailman/Cgi/admindb.py2
-rw-r--r--Mailman/ListAdmin.py10
-rw-r--r--NEWS5
3 files changed, 14 insertions, 3 deletions
diff --git a/Mailman/Cgi/admindb.py b/Mailman/Cgi/admindb.py
index 117923e0..ac4690b1 100644
--- a/Mailman/Cgi/admindb.py
+++ b/Mailman/Cgi/admindb.py
@@ -340,7 +340,7 @@ def show_pending_unsubs(mlist, form):
# Alphabetical order by email address
byaddrs = {}
for id in pendingunsubs:
- addr = mlist.GetRecord(id)[1]
+ addr = mlist.GetRecord(id)
byaddrs.setdefault(addr, []).append(id)
addrs = byaddrs.keys()
addrs.sort()
diff --git a/Mailman/ListAdmin.py b/Mailman/ListAdmin.py
index a290a358..714b2405 100644
--- a/Mailman/ListAdmin.py
+++ b/Mailman/ListAdmin.py
@@ -410,11 +410,14 @@ class ListAdmin:
if value == mm_cfg.DEFER:
return DEFER
elif value == mm_cfg.DISCARD:
- pass
+ syslog('vette', '%s: discarded subscription request from %s',
+ self.internal_name(), addr)
elif value == mm_cfg.REJECT:
self.__refuse(_('Subscription request'), addr,
comment or _('[No reason given]'),
lang=lang)
+ syslog('vette', """%s: rejected subscription request from %s
+\tReason: %s""", self.internal_name(), addr, comment or '[No reason given]')
else:
# subscribe
assert value == mm_cfg.SUBSCRIBE
@@ -462,9 +465,12 @@ class ListAdmin:
if value == mm_cfg.DEFER:
return DEFER
elif value == mm_cfg.DISCARD:
- pass
+ syslog('vette', '%s: discarded unsubscription request from %s',
+ self.internal_name(), addr)
elif value == mm_cfg.REJECT:
self.__refuse(_('Unsubscription request'), addr, comment)
+ syslog('vette', """%s: rejected unsubscription request from %s
+\tReason: %s""", self.internal_name(), addr, comment or '[No reason given]')
else:
assert value == mm_cfg.UNSUBSCRIBE
try:
diff --git a/NEWS b/NEWS
index 5be550b8..293cd7c2 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,11 @@ Here is a history of user visible changes to Mailman.
Bug Fixes and other patches
+ - Added vette logging for rejected and discarded (un)subscribe requests.
+
+ - Fixed a bug in admindb.py that could erroneously discard an unsubscribe
+ request as a duplicate.
+
- Decoded RFC 2047 encoded message subjects for a few reports.
Bug #266428.