diff options
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/setup/enableaccount | 11 | ||||
| -rwxr-xr-x | source4/setup/pwsettings | 12 |
2 files changed, 7 insertions, 16 deletions
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 diff --git a/source4/setup/pwsettings b/source4/setup/pwsettings index a2708531a1..fc59f8c404 100755 --- a/source4/setup/pwsettings +++ b/source4/setup/pwsettings @@ -64,14 +64,10 @@ else: samdb = SamDB(url=url, session_info=system_session(), credentials=creds, lp=lp) -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] - -res = samdb.search(domain_dn, scope=ldb.SCOPE_BASE, attrs=["pwdProperties", - "pwdHistoryLength", "minPwdLength", "minPwdAge", "maxPwdAge"]) +domain_dn = SamDB.domain_dn(samdb) +res = samdb.search(domain_dn, scope=ldb.SCOPE_BASE, + attrs=["pwdProperties", "pwdHistoryLength", "minPwdLength", "minPwdAge", + "maxPwdAge"]) assert(len(res) == 1) try: pwd_props = int(res[0]["pwdProperties"][0]) |