From fc42b0ab4135295fd23af5ab0cc0b410655bc376 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Sun, 4 Dec 2011 14:23:34 +0100 Subject: s4-python: factorize the definition of get_dsServiceName --- source4/scripting/python/samba/join.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'source4/scripting/python/samba/join.py') diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py index 5f546a100d..b46b4d8f06 100644 --- a/source4/scripting/python/samba/join.py +++ b/source4/scripting/python/samba/join.py @@ -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]: -- cgit