summaryrefslogtreecommitdiff
path: root/Mailman/Bouncer.py
diff options
context:
space:
mode:
authorbwarsaw2001-08-04 01:57:38 +0000
committerbwarsaw2001-08-04 01:57:38 +0000
commitefffbca18229f4196dfb50bccd56db9145dd81ac (patch)
tree9dd949ea475f8444d6cc9ec1b7fd098fdf97680f /Mailman/Bouncer.py
parent2fc5f12715c1ef0f87121eb3fc70ac4f3282a933 (diff)
downloadmailman-efffbca18229f4196dfb50bccd56db9145dd81ac.tar.gz
mailman-efffbca18229f4196dfb50bccd56db9145dd81ac.tar.zst
mailman-efffbca18229f4196dfb50bccd56db9145dd81ac.zip
Diffstat (limited to 'Mailman/Bouncer.py')
-rw-r--r--Mailman/Bouncer.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py
index 743df5921..c75c94219 100644
--- a/Mailman/Bouncer.py
+++ b/Mailman/Bouncer.py
@@ -103,6 +103,7 @@ class Bouncer:
addr = this_dude[0].lower()
hist = self.bounce_info[addr]
difference = now - hist[0]
+ # FIXME: Use MemberAdaptor interface
if len(Utils.FindMatchingAddresses(addr, self.members)):
if self.post_id - hist[2] > self.max_posts_between_bounces:
# There's been enough posts since last bounce that we're
@@ -206,7 +207,7 @@ Bad admin recipient: %s''', self.internal_name(), addr)
'did' : did,
'but' : but,
'reenable' : reenable,
- 'owneraddr': mm_cfg.MAILMAN_OWNER,
+ 'owneraddr': Utils.get_site_email(self.host_name, '-admin'),
}, mlist=self)
# add this here so it doesn't get wrapped/filled
# FIXME
@@ -236,7 +237,7 @@ Bad admin recipient: %s''', self.internal_name(), addr)
# send the bounce message
rname = self.real_name
msg = Message.UserNotification(
- recipient, mm_cfg.MAILMAN_OWNER,
+ recipient, Utils.get_site_email(self.host_name, '-admin'),
_('%(rname)s member %(addr)s bouncing - %(negative)s%(did)s'),
text)
msg['MIME-Version'] = '1.0'