1 files changed, 6 insertions, 8 deletions

diff --git a/Mailman/SecurityManager.py b/Mailman/SecurityManager.py
index 49db09fc2..03d5aa144 100644
--- a/Mailman/SecurityManager.py
+++ b/Mailman/SecurityManager.py
@@ -4,14 +4,14 @@
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software 
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 
@@ -75,8 +75,8 @@ class SecurityManager:
         # self.password is really a SecurityManager attribute, but it's set in
         # MailList.InitVars().
         self.mod_password = None
-	# Non configurable
-	self.passwords = {}
+        # Non configurable
+        self.passwords = {}
 
     def AuthContextInfo(self, authcontext, user=None):
         # authcontext may be one of AuthUser, AuthListModerator,
@@ -191,9 +191,7 @@ class SecurityManager:
                 if secret and sha.new(response).hexdigest() == secret:
                     return ac
             elif ac == mm_cfg.AuthUser:
-                # The user's passwords are kept in plain text
-                key, secret = self.AuthContextInfo(ac, user)
-                if secret and response == secret:
+                if self.authenticateMember(user, response):
                     return ac
             else:
                 # What is this context???