Merge branch 'master' of ssh://git.spline.de/account-web

1 files changed, 4 insertions, 5 deletions

diff --git a/account.py b/account.py
index d29755c..49051ed 100644
--- a/account.py
+++ b/account.py
@@ -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 = {}