From e95a350682f965780841712527e8e0cac282218d Mon Sep 17 00:00:00 2001 From: Nadezhda Ivanova Date: Tue, 23 Nov 2010 21:54:09 +0200 Subject: s4-dsdb: Changed filter to find the account of a user by samAccountName In newuser, a filter by dn was given to setpassword to find the account whose password is to be reset. It appears however that if given filter of type (dn=CN=smth) Windows fails to return the entry, and the tests that use newuser fail against it. Changed to use samAccountName instead. --- source4/scripting/python/samba/samdb.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source4') diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py index 98ae6791a5..668c6003d6 100644 --- a/source4/scripting/python/samba/samdb.py +++ b/source4/scripting/python/samba/samdb.py @@ -337,7 +337,7 @@ member: %s # Sets the password for it if setpassword: - self.setpassword("(dn=" + user_dn + ")", password, + self.setpassword("(samAccountName=%s)" % username, password, force_password_change_at_next_login_req) except: self.transaction_cancel() @@ -362,7 +362,6 @@ member: %s raise Exception('Unable to find user "%s"' % (username or search_filter)) assert(len(res) == 1) user_dn = res[0].dn - setpw = """ dn: %s changetype: modify -- cgit