1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00

Move domain DN determination out of newuser function.

This commit is contained in:
Jelmer Vernooij 2008-08-01 20:47:22 +02:00
parent 783412ecb2
commit cbac27e6fa

View File

@ -86,6 +86,14 @@ userAccountControl: %u
""" % (user_dn, userAccountControl)
self.modify_ldif(mod)
def domain_dn(self):
# find the DNs for the domain and the domain users group
res = self.search("", scope=ldb.SCOPE_BASE,
expression="(defaultNamingContext=*)",
attrs=["defaultNamingContext"])
assert(len(res) == 1 and res[0]["defaultNamingContext"] is not None)
return res[0]["defaultNamingContext"][0]
def newuser(self, username, unixname, password):
"""add a new user record.
@ -96,12 +104,7 @@ userAccountControl: %u
# connect to the sam
self.transaction_start()
# find the DNs for the domain and the domain users group
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]
domain_dn = self.domain_dn()
assert(domain_dn is not None)
user_dn = "CN=%s,CN=Users,%s" % (username, domain_dn)