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-python: factorize the definition of get_dsServiceName

Browse Source
This commit is contained in:
Matthieu Patou
2011-12-04 14:23:34 +01:00
parent 093dac4331
commit fc42b0ab41
4 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source4/scripting/python/samba/join.py
View File

@ -87,7 +87,7 @@ class dc_join(object):
ctx.forest_domain_name = ctx.get_forest_domain_name()
ctx.invocation_id = misc.GUID(str(uuid.uuid4()))
ctx.dc_ntds_dn = ctx.get_dsServiceName()
ctx.dc_ntds_dn = ctx.samdb.get_dsServiceName()
ctx.dc_dnsHostName = ctx.get_dnsHostName()
ctx.behavior_version = ctx.get_behavior_version()
@ -207,10 +207,6 @@ class dc_join(object):
return ctx.cldap_ret.pdc_dns_name
def get_dsServiceName(ctx):
res = ctx.samdb.search(base="", scope=ldb.SCOPE_BASE, attrs=["dsServiceName"])
return res[0]["dsServiceName"][0]
def get_behavior_version(ctx):
res = ctx.samdb.search(base=ctx.base_dn, scope=ldb.SCOPE_BASE, attrs=["msDS-Behavior-Version"])
if "msDS-Behavior-Version" in res[0]: