diff options
author | Andrew Tridgell <tridge@samba.org> | 2008-02-13 15:06:05 +1100 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2008-02-13 15:06:05 +1100 |
commit | 3cb87189f93956075979685d1454e4a514cb71a8 (patch) | |
tree | d99bfbc0d5b0f9271d9ef6973814048f2223f50b /source4/scripting/python/samba/samdb.py | |
parent | 88d2e0522737fb8856fb0f52c2af8a2f56130f19 (diff) | |
parent | d4006e799ac1305092c2d292c9237f58938268a2 (diff) | |
download | samba-3cb87189f93956075979685d1454e4a514cb71a8.tar.gz samba-3cb87189f93956075979685d1454e4a514cb71a8.tar.xz samba-3cb87189f93956075979685d1454e4a514cb71a8.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit b3793c6562b1a1e8711561f65594ba0676f9282d)
Diffstat (limited to 'source4/scripting/python/samba/samdb.py')
-rw-r--r-- | source4/scripting/python/samba/samdb.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py index c11fabf553..3c6bb23c02 100644 --- a/source4/scripting/python/samba/samdb.py +++ b/source4/scripting/python/samba/samdb.py @@ -100,12 +100,14 @@ userAccountControl: %u self.transaction_start() # find the DNs for the domain and the domain users group - res = self.search("", SCOPE_BASE, "defaultNamingContext=*", - ["defaultNamingContext"]) + res = self.search("", scope=ldb.SCOPE_BASE, + expression="(defaultNamingContext=*)", + attrs=["defaultNamingContext"]) assert(len(res) == 1 and res[0].defaultNamingContext is not None) domain_dn = res[0]["defaultNamingContext"][0] assert(domain_dn is not None) - dom_users = self.searchone(basedn=domain_dn, attribute="dn", expression="name=Domain Users") + dom_users = self.searchone(basedn=domain_dn, attribute="dn", + expression="name=Domain Users") assert(dom_users is not None) user_dn = "CN=%s,CN=Users,%s" % (username, domain_dn) |