From 0a5ea25d21a9745508e118a20fca837e74b031df Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Mon, 17 Aug 2009 11:47:53 +0200 Subject: s4:python tools - Centralise the lookups for the default domain (root) in the call "domain_dn" from SamDB --- source4/setup/enableaccount | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'source4/setup/enableaccount') diff --git a/source4/setup/enableaccount b/source4/setup/enableaccount index 1b7341946f..d4e954074b 100755 --- a/source4/setup/enableaccount +++ b/source4/setup/enableaccount @@ -56,14 +56,9 @@ else: samdb = SamDB(url=url, session_info=system_session(), credentials=creds, lp=lp) -if opts.base is None: - res = samdb.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] -else: - domain_dn = opts.base +domain_dn = opts.base +if domain_dn is None: + domain_dn = SamDB.domain_dn(samdb) filter = "(&(objectClass=user)(samAccountName=%s))" % username -- cgit