aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/MailList.py
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2015-08-21 09:26:28 -0700
committerMark Sapiro <mark@msapiro.net>2015-08-21 09:26:28 -0700
commita72747841df20c99dacb8c7033cc10c04c9a82fe (patch)
treea69089c036e449e28a785fa066fc743f47aa148b /Mailman/MailList.py
parentf092ac24ad774e5cd796a74b112c4650038ef28b (diff)
downloadmailman2-a72747841df20c99dacb8c7033cc10c04c9a82fe.tar.gz
mailman2-a72747841df20c99dacb8c7033cc10c04c9a82fe.tar.xz
mailman2-a72747841df20c99dacb8c7033cc10c04c9a82fe.zip
Implemented GLOBAL_BAN_LIST.
Diffstat (limited to '')
-rwxr-xr-xMailman/MailList.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index 6404666a..2095d107 100755
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -1564,7 +1564,9 @@ bad regexp in bounce_matching_header line: %s
"""Returns matched entry in ban_list if email matches.
Otherwise returns None.
"""
- return self.GetPattern(email, self.ban_list)
+ return (self.GetPattern(email, self.ban_list) or
+ self.GetPattern(email, mm_cfg.GLOBAL_BAN_LIST)
+ )
def HasAutoApprovedSender(self, sender):
"""Returns True and logs if sender matches address or pattern