main(): When the list is an umbrella list for other lists, the

recipients for password notices are the administrators of the member
addresses - this way, the password will not be advertised to the
sublist membership!

1 files changed, 5 insertions, 3 deletions

diff --git a/cron/mailpasswds b/cron/mailpasswds
index 1c3d65290..215ed45c4 100755
--- a/cron/mailpasswds
+++ b/cron/mailpasswds
@@ -88,7 +88,7 @@ def main(args):
     for name in Utils.list_names():
 	list = MailList.MailList(name, lock = 0)
 	list_name = list.real_name
-	reminders_to_admins = list.reminders_to_admins
+	umbrella_list = list.umbrella_list
 	if not list.send_reminders:
 	    continue
 	for user, password in list.passwords.items():
@@ -98,8 +98,10 @@ def main(args):
                 else:
                     print "%s in %s" % (user, list.real_name)
 	    url = list.GetAbsoluteOptionsURL(user)
-	    if reminders_to_admins:
-		recipient = "%s-admin@%s" % tuple(string.split(user, '@'))
+	    if umbrella_list:
+                acct, host = tuple(string.split(user, '@'))
+                recipient = ("%s%s@%s" %
+                             (acct, list.umbrella_member_suffix, host))
 	    else:
 		recipient = user
 	    if users.has_key(recipient):