Commit 5cc8d9d8 authored by Andreas Jung's avatar Andreas Jung

- AccessControl: creating a new user through "zpasswd inituser" did not

        work properly with a top-level user folder with enabled password
        encryption.
parent 8ddad1a7
...@@ -26,6 +26,10 @@ Zope Changes ...@@ -26,6 +26,10 @@ Zope Changes
Bugs Fixed 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 - ZCatalog: refreshCatalog() could not be called safely from a ZEO
client script client script
......
...@@ -1044,7 +1044,8 @@ class UserFolder(BasicUserFolder): ...@@ -1044,7 +1044,8 @@ class UserFolder(BasicUserFolder):
def _doAddUser(self, name, password, roles, domains, **kw): def _doAddUser(self, name, password, roles, domains, **kw):
"""Create a new user""" """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) password = self._encryptPassword(password)
self.data[name]=User(name,password,roles,domains) self.data[name]=User(name,password,roles,domains)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment