[Zope-Checkins] CVS: Zope/lib/python/AccessControl - User.py:1.173

[Lennart Regebro]

Update of /cvs-repository/Zope/lib/python/AccessControl
In directory cvs.zope.org:/tmp/cvs-serv10294/lib/python/AccessControl

Modified Files:
	User.py 
Log Message:
Merge with HEAD: Collector #256: Added a check in _doChangeUser to make sure passwords isn't encrypted twice.

=== Zope/lib/python/AccessControl/User.py 1.172 => 1.173 ===
--- Zope/lib/python/AccessControl/User.py:1.172	Wed Oct 16 17:14:41 2002
+++ Zope/lib/python/AccessControl/User.py	Mon Dec 16 12:20:16 2002
@@ -1034,7 +1034,7 @@
     def _doChangeUser(self, name, password, roles, domains, **kw):
         user=self.data[name]
         if password is not None:
-            if self.encrypt_passwords:
+            if self.encrypt_passwords and not self._isPasswordEncrypted(pw):
                 password = self._encryptPassword(password)
             user.__=password
         user.roles=roles