4 files changed, 20 insertions, 4 deletions

diff --git a/Mailman/Crypt.py b/Mailman/Crypt.py
index 19783ec0b..6f568464c 100644
--- a/Mailman/Crypt.py
+++ b/Mailman/Crypt.py
@@ -1,6 +1,8 @@
-try:
+import mm_cfg
+
+if mm_cfg.USE_CRYPT:
     from crypt import *
-except ImportError:
+else:
     def crypt(string, seed):
         import md5
         return md5.new(string).digest()
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index 8dc8a8b20..5be909032 100644
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -44,6 +44,12 @@ MAILMAN_OWNER     = 'mailman-owner@%s' % DEFAULT_HOST_NAME
 # System ceiling on number of batches into which deliveries are divided:
 MAX_SPAWNS        = 40
 
+# 1 to use crypt for passwords instead of md5.
+# Crypt may not work on all python installs.
+# Don't change this value once you have lists running...
+# In fact, you should just let configure set this one and leave it alone.
+USE_CRYPT         = 1
+
 			 # General Defaults #
 
 DEFAULT_FILTER_PROG = ''
diff --git a/modules/mm_crypt.py b/modules/mm_crypt.py
index 19783ec0b..6f568464c 100644
--- a/modules/mm_crypt.py
+++ b/modules/mm_crypt.py
@@ -1,6 +1,8 @@
-try:
+import mm_cfg
+
+if mm_cfg.USE_CRYPT:
     from crypt import *
-except ImportError:
+else:
     def crypt(string, seed):
         import md5
         return md5.new(string).digest()
diff --git a/modules/mm_defaults.py.in b/modules/mm_defaults.py.in
index 8dc8a8b20..5be909032 100644
--- a/modules/mm_defaults.py.in
+++ b/modules/mm_defaults.py.in
@@ -44,6 +44,12 @@ MAILMAN_OWNER     = 'mailman-owner@%s' % DEFAULT_HOST_NAME
 # System ceiling on number of batches into which deliveries are divided:
 MAX_SPAWNS        = 40
 
+# 1 to use crypt for passwords instead of md5.
+# Crypt may not work on all python installs.
+# Don't change this value once you have lists running...
+# In fact, you should just let configure set this one and leave it alone.
+USE_CRYPT         = 1
+
 			 # General Defaults #
 
 DEFAULT_FILTER_PROG = ''