Log message for revision 37978:
- AccessControl: creating a new user through "zpasswd inituser" did not
work properly with a top-level user folder with enabled password
encryption.
Changed:
U Zope/branches/Zope-2_8-branch/doc/CHANGES.txt
U Zope/branches/Zope-2_8-branch/lib/python/AccessControl/User.py
-=-
Modified: Zope/branches/Zope-2_8-branch/doc/CHANGES.txt
===================================================================
--- Zope/branches/Zope-2_8-branch/doc/CHANGES.txt 2005-08-17 01:02:10 UTC
(rev 37977)
+++ Zope/branches/Zope-2_8-branch/doc/CHANGES.txt 2005-08-17 06:17:06 UTC
(rev 37978)
@@ -26,6 +26,10 @@
Bugs Fixed
+ - AccessControl: creating a new user through "zpasswd inituser" did not
+ work properly with a top-level user folder with enabled password
+ encryption.
+
- ZCatalog: refreshCatalog() could not be called safely from a ZEO
client script
Modified: Zope/branches/Zope-2_8-branch/lib/python/AccessControl/User.py
===================================================================
--- Zope/branches/Zope-2_8-branch/lib/python/AccessControl/User.py
2005-08-17 01:02:10 UTC (rev 37977)
+++ Zope/branches/Zope-2_8-branch/lib/python/AccessControl/User.py
2005-08-17 06:17:06 UTC (rev 37978)
@@ -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(pw):
password = self._encryptPassword(password)
self.data[name]=User(name,password,roles,domains)
_______________________________________________
Zope-Checkins maillist - Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins
