6 files changed, 28 insertions, 2 deletions

diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index b52f0d0e8..8dc8a8b20 100644
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -79,6 +79,8 @@ DEFAULT_ACCEPTABLE_ALIASES ="""
 DEFAULT_REMINDERS_TO_ADMINS = 0
 # This variable controlls whether monthly password reminders are sent.
 DEFAULT_SEND_REMINDERS = 1
+# Send welcome messages to new users?  Probably should keep this set to 1.
+DEFAULT_SEND_WELCOME_MSG = 1
 # Wipe sender information, and make it look like the list-admin
 # address sends all messages
 DEFAULT_ANONYMOUS_LIST = 0
@@ -213,4 +215,4 @@ PRIVATE_ARCHIVE_FILE_DIR	= os.path.join(PREFIX, 'archives/private')
 VERSION           = '@VERSION@'
 
 # Data file version number
-DATA_FILE_VERSION = 2
+DATA_FILE_VERSION = 3
diff --git a/Mailman/Deliverer.py b/Mailman/Deliverer.py
index c9ca8ef60..205fdfd71 100644
--- a/Mailman/Deliverer.py
+++ b/Mailman/Deliverer.py
@@ -194,6 +194,8 @@ class Deliverer:
         return body
 
     def SendSubscribeAck(self, name, password, digest):
+        if not self.send_welcome_msg:
+	    return
 	if digest:
 	    digest_mode = '(Digest mode)'
 	else:
diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index 8cf620eca..a3474f714 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -154,6 +154,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
         self.acceptable_aliases = mm_cfg.DEFAULT_ACCEPTABLE_ALIASES
 	self.reminders_to_admins = mm_cfg.DEFAULT_REMINDERS_TO_ADMINS
 	self.send_reminders = mm_cfg.DEFAULT_SEND_REMINDERS
+    	self.send_welcome_msg = mm_cfg.DEFAULT_SEND_WELCOME_MSG
 	self.bounce_matching_headers = \
 		mm_cfg.DEFAULT_BOUNCE_MATCHING_HEADERS
         self.anonymous_list = mm_cfg.DEFAULT_ANONYMOUS_LIST
@@ -284,6 +285,14 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
 	     'Send monthly password reminders or no? Overrides the previous '
 	     'option.'),
 
+	    ('send_welcome_msg', mm_cfg.Radio, ('No', 'Yes'), 0, 
+	     'Send welcome message when people subscribe?',
+	     "Turn this on only if you plan on subscribing people manually "
+	     "and don't want them to know that you did so.  This option "
+	     "is most useful for transparently migrating lists from "
+	     "some other mailing list manager to Mailman."),
+
+
 	    ('admin_immed_notify', mm_cfg.Radio, ('No', 'Yes'), 0,
 	     'Should administrator get immediate notice of new requests, '
 	     'as well as daily notices about collected ones?',
diff --git a/modules/maillist.py b/modules/maillist.py
index 8cf620eca..a3474f714 100644
--- a/modules/maillist.py
+++ b/modules/maillist.py
@@ -154,6 +154,7 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
         self.acceptable_aliases = mm_cfg.DEFAULT_ACCEPTABLE_ALIASES
 	self.reminders_to_admins = mm_cfg.DEFAULT_REMINDERS_TO_ADMINS
 	self.send_reminders = mm_cfg.DEFAULT_SEND_REMINDERS
+    	self.send_welcome_msg = mm_cfg.DEFAULT_SEND_WELCOME_MSG
 	self.bounce_matching_headers = \
 		mm_cfg.DEFAULT_BOUNCE_MATCHING_HEADERS
         self.anonymous_list = mm_cfg.DEFAULT_ANONYMOUS_LIST
@@ -284,6 +285,14 @@ class MailList(MailCommandHandler, HTMLFormatter, Deliverer, ListAdmin,
 	     'Send monthly password reminders or no? Overrides the previous '
 	     'option.'),
 
+	    ('send_welcome_msg', mm_cfg.Radio, ('No', 'Yes'), 0, 
+	     'Send welcome message when people subscribe?',
+	     "Turn this on only if you plan on subscribing people manually "
+	     "and don't want them to know that you did so.  This option "
+	     "is most useful for transparently migrating lists from "
+	     "some other mailing list manager to Mailman."),
+
+
 	    ('admin_immed_notify', mm_cfg.Radio, ('No', 'Yes'), 0,
 	     'Should administrator get immediate notice of new requests, '
 	     'as well as daily notices about collected ones?',
diff --git a/modules/mm_defaults.py.in b/modules/mm_defaults.py.in
index b52f0d0e8..8dc8a8b20 100644
--- a/modules/mm_defaults.py.in
+++ b/modules/mm_defaults.py.in
@@ -79,6 +79,8 @@ DEFAULT_ACCEPTABLE_ALIASES ="""
 DEFAULT_REMINDERS_TO_ADMINS = 0
 # This variable controlls whether monthly password reminders are sent.
 DEFAULT_SEND_REMINDERS = 1
+# Send welcome messages to new users?  Probably should keep this set to 1.
+DEFAULT_SEND_WELCOME_MSG = 1
 # Wipe sender information, and make it look like the list-admin
 # address sends all messages
 DEFAULT_ANONYMOUS_LIST = 0
@@ -213,4 +215,4 @@ PRIVATE_ARCHIVE_FILE_DIR	= os.path.join(PREFIX, 'archives/private')
 VERSION           = '@VERSION@'
 
 # Data file version number
-DATA_FILE_VERSION = 2
+DATA_FILE_VERSION = 3
diff --git a/modules/mm_deliver.py b/modules/mm_deliver.py
index c9ca8ef60..205fdfd71 100644
--- a/modules/mm_deliver.py
+++ b/modules/mm_deliver.py
@@ -194,6 +194,8 @@ class Deliverer:
         return body
 
     def SendSubscribeAck(self, name, password, digest):
+        if not self.send_welcome_msg:
+	    return
 	if digest:
 	    digest_mode = '(Digest mode)'
 	else: