From 593ae5e89571d986c7e9183e53a3fb709fb05a82 Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Mon, 2 Dec 2002 14:47:21 +0000
Subject: main(): Use DEFAULT_EMAIL_HOST unless DEFAULT_HOST_NAME was
 overridden in mm_cfg.py

---
 cron/mailpasswds | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cron/mailpasswds b/cron/mailpasswds
index 5d8b60f6b..a009e92b5 100755
--- a/cron/mailpasswds
+++ b/cron/mailpasswds
@@ -113,7 +113,7 @@ def main():
         sys.exit(1)
 
     # Group lists by host_name if VIRTUAL_HOST_OVERVIEW is true, otherwise
-    # there's only one key in this dictionary: mm_cfg.DEFAULT_HOST_NAME.  The
+    # there's only one key in this dictionary: mm_cfg.DEFAULT_EMAIL_HOST.  The
     # values are lists of the unlocked MailList instances.
     byhost = {}
     for listname in listnames:
@@ -123,7 +123,9 @@ def main():
         if mm_cfg.VIRTUAL_HOST_OVERVIEW:
             host = mlist.host_name
         else:
-            host = mm_cfg.DEFAULT_HOST_NAME
+            # See the note in Defaults.py concerning DEFAULT_HOST_NAME
+            # vs. DEFAULT_EMAIL_HOST.
+            host = mm_cfg.DEFAULT_HOST_NAME or mm_cfg.DEFAULT_EMAIL_HOST
         byhost.setdefault(host, []).append(mlist)
 
     # Now for each virtual host, collate the user information.  Each user
-- 
cgit v1.3.1