diff options
author | Marian Sigler <m@qjym.de> | 2012-09-21 01:41:10 +0200 |
---|---|---|
committer | Marian Sigler <m@qjym.de> | 2012-09-21 01:41:10 +0200 |
commit | f774c99fb887b7e2ad7c9f0e62efa631d319440d (patch) | |
tree | 6a396267ac6507f03c683bb39aef15a2981b7e35 /account.py | |
parent | 5a4ecaddb41f6085ea43127376e519bf2454236a (diff) | |
parent | 86815ec24c9c194f446a0800d8b7d738c597eea4 (diff) | |
download | web-f774c99fb887b7e2ad7c9f0e62efa631d319440d.tar.gz web-f774c99fb887b7e2ad7c9f0e62efa631d319440d.tar.bz2 web-f774c99fb887b7e2ad7c9f0e62efa631d319440d.zip |
Merge branch 'master' of ssh://git.spline.de/account-web
Diffstat (limited to 'account.py')
-rw-r--r-- | account.py | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -124,7 +124,7 @@ class AccountService: """ user = 'uid=%s,ou=users' % account.uid if admin_user: - user = 'cn=%' % user + user = 'cn=%s' % admin_user password = account.password if admin_pass: @@ -186,15 +186,14 @@ class AccountService: account.new_password_root = None - for service, password in account.new_password_services: + for service, password in account.new_password_services.items(): attr = [ - (ldap.MOD_REPLACE, 'objectClass', LDAP_OBJECT_CLASS) (ldap.MOD_REPLACE, 'userPassword', password) ] - dn = 'uid=%s,ou=services,cn=%s,%s' % (account.uid, service, self.base_dn) + dn = 'uid=%s,cn=%s,ou=services,%s' % (account.uid, service, self.base_dn) self.connection.modify_s(dn, attr) - account.new_password_services = [] + account.new_password_services = {} |