aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Popovitch <jimpop@gmail.com>2016-10-08 22:35:15 +0000
committerJim Popovitch <jimpop@gmail.com>2016-10-08 22:35:15 +0000
commit962c9d48558a3545fa2e319fa3033ba3aaead2ec (patch)
treea91c251d32f0052dd83501c27486fe3394bb9d7c
parente4302599c58732d14e2c901092b5e8df13c3f46e (diff)
downloadmailman2-962c9d48558a3545fa2e319fa3033ba3aaead2ec.tar.gz
mailman2-962c9d48558a3545fa2e319fa3033ba3aaead2ec.tar.xz
mailman2-962c9d48558a3545fa2e319fa3033ba3aaead2ec.zip
Send bounce messages from virtual domains not siteowner
Diffstat (limited to '')
-rw-r--r--Mailman/Bouncer.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/Mailman/Bouncer.py b/Mailman/Bouncer.py
index 29fe4ea5..47955fa3 100644
--- a/Mailman/Bouncer.py
+++ b/Mailman/Bouncer.py
@@ -224,7 +224,7 @@ class Bouncer:
# it was of dubious value). However, we'll provide empty, strange, or
# meaningless strings for the unused %()s fields so that the language
# translators don't have to provide new templates.
- siteowner = Utils.get_site_email(self.host_name)
+ owneraddr = self.GetOwnerEmail()
text = Utils.maketext(
'bounce.txt',
{'listname' : self.real_name,
@@ -233,11 +233,10 @@ class Bouncer:
'did' : _('disabled'),
'but' : '',
'reenable' : '',
- 'owneraddr': siteowner,
+ 'owneraddr': owneraddr,
}, mlist=self)
subject = _('Bounce action notification')
- umsg = Message.UserNotification(self.GetOwnerEmail(),
- siteowner, subject,
+ umsg = Message.UserNotification(owneraddr, owneraddr, subject,
lang=self.preferred_language)
# BAW: Be sure you set the type before trying to attach, or you'll get
# a MultipartConversionError.