main(): All owner refereces should point to the mailman-owner@dom.ain

address instead of the mailman-admin@dom.ain address.  We don't want
people contacting the site owner to be bounce processed.

Also, Utils.get_site_email()'s second argument should no longer
include the leading dash.

Set the `errorsto' metadata to the mailman-bounces address, and add a
`verp' flag in the metadata set to VERP_PASSWORD_REMINDERS.

1 files changed, 7 insertions, 5 deletions

diff --git a/cron/mailpasswds b/cron/mailpasswds
index ef961c6f2..f0481c626 100755
--- a/cron/mailpasswds
+++ b/cron/mailpasswds
@@ -155,25 +155,27 @@ def main():
             header = '%-40s %-10s\n%-40s %-10s' % (
                 _('List'), _('Password // URL'), '----', '--------')
             # Now we're finally ready to send the email!
-            siteadmin = Utils.get_site_email(host, '-admin')
-            sitereq = Utils.get_site_email(host, '-request')
+            siteowner = Utils.get_site_email(host, 'owner')
+            sitereq = Utils.get_site_email(host, 'request')
+            sitebounce = Utils.get_site_email(host, 'bounces')
             text = Utils.maketext(
                 'cronpass.txt',
                 {'hostname': host,
                  'useraddr': addr,
                  'exreq'   : sitereq,
-                 'owner'   : siteadmin,
+                 'owner'   : siteowner,
                  }, lang=poplang)
             # Add the table to the end so it doesn't get wrapped/filled
             text += (header + '\n' + NL.join(table))
-            msg = Message.UserNotification(addr, sitereq, subj, text)
+            msg = Message.UserNotification(addr, siteowner, subj, text)
             msg['X-No-Archive'] = 'yes'
             # We want to make this look like it's coming from the siteowner's
             # list, but we also want to be sure that the apparent host name is
             # the current virtual host.  Look in CookHeaders.py for why this
             # trick works.  Blarg.
-            msg.send(sitelist, **{'errorsto': sitereq,
+            msg.send(sitelist, **{'errorsto': sitebounce,
                                   '_nolist' : 1,
+                                  'verp'    : mm_cfg.VERP_PASSWORD_REMINDERS,
                                   })