sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

s4-net: Simplify SamDB connect code.

Browse Source
This commit is contained in:
Jelmer Vernooij
2010-04-08 12:19:51 +02:00
parent 2578072541
commit 479fd9c03f
8 changed files with 10 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source4/scripting/python/samba/netcmd/domainlevel.py
View File

@ -73,12 +73,7 @@ class cmd_domainlevel(Command):
lp = sambaopts.get_loadparm() lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp) creds = credopts.get_credentials(lp)
if H is not None: samdb = SamDB(url=H, session_info=system_session(),
url = H
else:
url = lp.get("sam database")
samdb = SamDB(url=url, session_info=system_session(),
credentials=creds, lp=lp) credentials=creds, lp=lp)
domain_dn = SamDB.domain_dn(samdb) domain_dn = SamDB.domain_dn(samdb)

10
source4/scripting/python/samba/netcmd/dsacl.py
View File

@ -132,15 +132,11 @@ class cmd_ds_acl_set(Command):
lp = sambaopts.get_loadparm() lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp) 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() return self.usage()
if host is not None: samdb = SamDB(url=host, session_info=system_session(),
url = host
else:
url = lp.get("sam database")
samdb = SamDB(url=url, session_info=system_session(),
credentials=creds, lp=lp) credentials=creds, lp=lp)
cars = {'change-rid' : GUID_DRS_CHANGE_RID_MASTER, cars = {'change-rid' : GUID_DRS_CHANGE_RID_MASTER,
'change-pdc' : GUID_DRS_CHANGE_PDC, 'change-pdc' : GUID_DRS_CHANGE_PDC,

7
source4/scripting/python/samba/netcmd/enableaccount.py
View File

@ -55,11 +55,6 @@ class cmd_enableaccount(Command):
lp = sambaopts.get_loadparm() lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp) creds = credopts.get_credentials(lp)
if H is not None: samdb = SamDB(url=H, session_info=system_session(),
url = H
else:
url = lp.get("sam database")
samdb = SamDB(url=url, session_info=system_session(),
credentials=creds, lp=lp) credentials=creds, lp=lp)
samdb.enable_account(filter) samdb.enable_account(filter)

7
source4/scripting/python/samba/netcmd/fsmo.py
View File

@ -135,12 +135,7 @@ all=all of the above"""),
lp = sambaopts.get_loadparm() lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp) creds = credopts.get_credentials(lp)
if host is not None: samdb = SamDB(url=host, session_info=system_session(),
url = host
else:
url = lp.get("sam database")
samdb = SamDB(url=url, session_info=system_session(),
credentials=creds, lp=lp) credentials=creds, lp=lp)
domain_dn = SamDB.domain_dn(samdb) domain_dn = SamDB.domain_dn(samdb)

7
source4/scripting/python/samba/netcmd/newuser.py
View File

@ -59,12 +59,7 @@ class cmd_newuser(Command):
lp = sambaopts.get_loadparm() lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp) creds = credopts.get_credentials(lp)
if H is not None: samdb = SamDB(url=H, session_info=system_session(), credentials=creds,
url = H
else:
url = lp.get("sam database")
samdb = SamDB(url=url, session_info=system_session(), credentials=creds,
lp=lp) lp=lp)
samdb.newuser(username, unixname, password, samdb.newuser(username, unixname, password,
force_password_change_at_next_login_req=must_change_at_next_login) force_password_change_at_next_login_req=must_change_at_next_login)

7
source4/scripting/python/samba/netcmd/pwsettings.py
View File

@ -69,12 +69,7 @@ class cmd_pwsettings(Command):
lp = sambaopts.get_loadparm() lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp) creds = credopts.get_credentials(lp)
if H is not None: samdb = SamDB(url=H, session_info=system_session(),
url = H
else:
url = lp.get("sam database")
samdb = SamDB(url=url, session_info=system_session(),
credentials=creds, lp=lp) credentials=creds, lp=lp)
domain_dn = SamDB.domain_dn(samdb) domain_dn = SamDB.domain_dn(samdb)

7
source4/scripting/python/samba/netcmd/setexpiry.py
View File

@ -61,12 +61,7 @@ class cmd_setexpiry(Command):
if days is None: if days is None:
days = 0 days = 0
if H is not None: samdb = SamDB(url=H, session_info=system_session(),
url = H
else:
url = lp.get("sam database")
samdb = SamDB(url=url, session_info=system_session(),
credentials=creds, lp=lp) credentials=creds, lp=lp)
samdb.setexpiry(filter, days*24*3600, no_expiry_req=noexpiry) samdb.setexpiry(filter, days*24*3600, no_expiry_req=noexpiry)

7
source4/scripting/python/samba/netcmd/setpassword.py
View File

@ -65,12 +65,7 @@ class cmd_setpassword(Command):
lp = sambaopts.get_loadparm() lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp) creds = credopts.get_credentials(lp)
if H is not None: samdb = SamDB(url=H, session_info=system_session(),
url = H
else:
url = lp.get("sam database")
samdb = SamDB(url=url, session_info=system_session(),
credentials=creds, lp=lp) credentials=creds, lp=lp)
samdb.setpassword(filter, password, samdb.setpassword(filter, password,