[Zope-Checkins] CVS: Packages/AccessControl - User.py:1.176.14.9

[Andreas Jung]

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

Modified Files:
      Tag: Zope-2_7-branch
	User.py 
Log Message:
      - AccessControl: creating a new user through "zpasswd inituser" did not
        work properly with a top-level user folder with enabled password
        encryption.


=== Packages/AccessControl/User.py 1.176.14.8 => 1.176.14.9 ===
--- Packages/AccessControl/User.py:1.176.14.8	Fri Mar 18 08:17:31 2005
+++ Packages/AccessControl/User.py	Wed Aug 17 07:31:39 2005
@@ -1044,7 +1044,8 @@
 
     def _doAddUser(self, name, password, roles, domains, **kw):
         """Create a new user"""
-        if password is not None and self.encrypt_passwords:
+        if password is not None and self.encrypt_passwords \
+                   and not self._isPasswordEncrypted(password):
             password = self._encryptPassword(password)
         self.data[name]=User(name,password,roles,domains)