mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
s4-net: Simplify SamDB connect code.
This commit is contained in:
parent
2578072541
commit
479fd9c03f
@ -73,12 +73,7 @@ class cmd_domainlevel(Command):
|
||||
lp = sambaopts.get_loadparm()
|
||||
creds = credopts.get_credentials(lp)
|
||||
|
||||
if H is not None:
|
||||
url = H
|
||||
else:
|
||||
url = lp.get("sam database")
|
||||
|
||||
samdb = SamDB(url=url, session_info=system_session(),
|
||||
samdb = SamDB(url=H, session_info=system_session(),
|
||||
credentials=creds, lp=lp)
|
||||
|
||||
domain_dn = SamDB.domain_dn(samdb)
|
||||
|
@ -132,15 +132,11 @@ class cmd_ds_acl_set(Command):
|
||||
lp = sambaopts.get_loadparm()
|
||||
creds = credopts.get_credentials(lp)
|
||||
|
||||
if car == None or action == None or objectdn == None or trusteedn == None:
|
||||
if (car is None or action is None or objectdn is None or
|
||||
trusteedn is None):
|
||||
return self.usage()
|
||||
|
||||
if host is not None:
|
||||
url = host
|
||||
else:
|
||||
url = lp.get("sam database")
|
||||
|
||||
samdb = SamDB(url=url, session_info=system_session(),
|
||||
samdb = SamDB(url=host, session_info=system_session(),
|
||||
credentials=creds, lp=lp)
|
||||
cars = {'change-rid' : GUID_DRS_CHANGE_RID_MASTER,
|
||||
'change-pdc' : GUID_DRS_CHANGE_PDC,
|
||||
|
@ -55,11 +55,6 @@ class cmd_enableaccount(Command):
|
||||
lp = sambaopts.get_loadparm()
|
||||
creds = credopts.get_credentials(lp)
|
||||
|
||||
if H is not None:
|
||||
url = H
|
||||
else:
|
||||
url = lp.get("sam database")
|
||||
|
||||
samdb = SamDB(url=url, session_info=system_session(),
|
||||
samdb = SamDB(url=H, session_info=system_session(),
|
||||
credentials=creds, lp=lp)
|
||||
samdb.enable_account(filter)
|
||||
|
@ -135,12 +135,7 @@ all=all of the above"""),
|
||||
lp = sambaopts.get_loadparm()
|
||||
creds = credopts.get_credentials(lp)
|
||||
|
||||
if host is not None:
|
||||
url = host
|
||||
else:
|
||||
url = lp.get("sam database")
|
||||
|
||||
samdb = SamDB(url=url, session_info=system_session(),
|
||||
samdb = SamDB(url=host, session_info=system_session(),
|
||||
credentials=creds, lp=lp)
|
||||
|
||||
domain_dn = SamDB.domain_dn(samdb)
|
||||
|
@ -59,12 +59,7 @@ class cmd_newuser(Command):
|
||||
lp = sambaopts.get_loadparm()
|
||||
creds = credopts.get_credentials(lp)
|
||||
|
||||
if H is not None:
|
||||
url = H
|
||||
else:
|
||||
url = lp.get("sam database")
|
||||
|
||||
samdb = SamDB(url=url, session_info=system_session(), credentials=creds,
|
||||
samdb = SamDB(url=H, session_info=system_session(), credentials=creds,
|
||||
lp=lp)
|
||||
samdb.newuser(username, unixname, password,
|
||||
force_password_change_at_next_login_req=must_change_at_next_login)
|
||||
|
@ -69,12 +69,7 @@ class cmd_pwsettings(Command):
|
||||
lp = sambaopts.get_loadparm()
|
||||
creds = credopts.get_credentials(lp)
|
||||
|
||||
if H is not None:
|
||||
url = H
|
||||
else:
|
||||
url = lp.get("sam database")
|
||||
|
||||
samdb = SamDB(url=url, session_info=system_session(),
|
||||
samdb = SamDB(url=H, session_info=system_session(),
|
||||
credentials=creds, lp=lp)
|
||||
|
||||
domain_dn = SamDB.domain_dn(samdb)
|
||||
|
@ -61,12 +61,7 @@ class cmd_setexpiry(Command):
|
||||
if days is None:
|
||||
days = 0
|
||||
|
||||
if H is not None:
|
||||
url = H
|
||||
else:
|
||||
url = lp.get("sam database")
|
||||
|
||||
samdb = SamDB(url=url, session_info=system_session(),
|
||||
samdb = SamDB(url=H, session_info=system_session(),
|
||||
credentials=creds, lp=lp)
|
||||
|
||||
samdb.setexpiry(filter, days*24*3600, no_expiry_req=noexpiry)
|
||||
|
@ -65,12 +65,7 @@ class cmd_setpassword(Command):
|
||||
lp = sambaopts.get_loadparm()
|
||||
creds = credopts.get_credentials(lp)
|
||||
|
||||
if H is not None:
|
||||
url = H
|
||||
else:
|
||||
url = lp.get("sam database")
|
||||
|
||||
samdb = SamDB(url=url, session_info=system_session(),
|
||||
samdb = SamDB(url=H, session_info=system_session(),
|
||||
credentials=creds, lp=lp)
|
||||
|
||||
samdb.setpassword(filter, password,
|
||||
|
Loading…
Reference in New Issue
Block a user