sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-29 15:42:04 +03:00
Code Activity

s4-subdomain: fixed domain guid choice for subdomain join

Browse Source 
We need to use the domain GUID that the server choose in the ncName
link

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andrew Tridgell
2011-09-07 17:21:07 +10:00
committed by Andrew Bartlett
parent 877e48cac8
commit 588c50f11e
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ from samba.dcerpc import security
import logging import logging
import talloc import talloc
import random import random
import time
# this makes debugging easier # this makes debugging easier
talloc.enable_null_tracking() talloc.enable_null_tracking()
@ -123,7 +124,6 @@ class dc_join(object):
ctx.drsuapi = None ctx.drsuapi = None
ctx.managedby = None ctx.managedby = None
ctx.subdomain = False ctx.subdomain = False
ctx.domguid = None
def del_noerror(ctx, dn, recursive=False): def del_noerror(ctx, dn, recursive=False):
@ -346,6 +346,10 @@ class dc_join(object):
print("DsAddEntry failed with status %s info %s" % (ctr.err_data.status, print("DsAddEntry failed with status %s info %s" % (ctr.err_data.status,
ctr.err_data.info.extended_err)) ctr.err_data.info.extended_err))
raise RuntimeError("DsAddEntry failed") raise RuntimeError("DsAddEntry failed")
if ctr.err_data.dir_err != drsuapi.DRSUAPI_DIRERR_OK:
print("DsAddEntry failed with dir_err %u" % ctr.err_data.dir_err)
raise RuntimeError("DsAddEntry failed")
def join_add_ntdsdsa(ctx): def join_add_ntdsdsa(ctx):
'''add the ntdsdsa object''' '''add the ntdsdsa object'''
@ -539,7 +543,6 @@ class dc_join(object):
configdn=ctx.config_dn, configdn=ctx.config_dn,
serverdn=ctx.server_dn, domain=ctx.domain_name, serverdn=ctx.server_dn, domain=ctx.domain_name,
hostname=ctx.myname, domainsid=ctx.domsid, hostname=ctx.myname, domainsid=ctx.domsid,
domainguid=ctx.domguid,
machinepass=ctx.acct_pass, serverrole="domain controller", machinepass=ctx.acct_pass, serverrole="domain controller",
sitename=ctx.site, lp=ctx.lp, ntdsguid=ctx.ntds_guid) sitename=ctx.site, lp=ctx.lp, ntdsguid=ctx.ntds_guid)
print "Provision OK for domain DN %s" % presult.domaindn print "Provision OK for domain DN %s" % presult.domaindn
@ -561,6 +564,13 @@ class dc_join(object):
ctx.samdb.set_invocation_id(str(ctx.invocation_id)) ctx.samdb.set_invocation_id(str(ctx.invocation_id))
ctx.local_samdb = ctx.samdb ctx.local_samdb = ctx.samdb
print("Finding domain GUID from ncName")
res = ctx.samdb.search(base=ctx.partition_dn, scope=ldb.SCOPE_BASE, attrs=['ncName'],
controls=["extended_dn:1:1"])
domguid = str(misc.GUID(ldb.Dn(ctx.samdb, res[0]['ncName'][0]).get_extended_component('GUID')))
print("Got domain GUID %s" % domguid)
ctx.join_add_ntdsdsa() ctx.join_add_ntdsdsa()
print("Calling own domain provision") print("Calling own domain provision")
@ -572,7 +582,7 @@ class dc_join(object):
presult = provision_fill(ctx.local_samdb, secrets_ldb, presult = provision_fill(ctx.local_samdb, secrets_ldb,
logger, ctx.names, ctx.paths, domainsid=security.dom_sid(ctx.domsid), logger, ctx.names, ctx.paths, domainsid=security.dom_sid(ctx.domsid),
domainguid=ctx.domguid, domainguid=domguid,
targetdir=ctx.targetdir, samdb_fill=FILL_SUBDOMAIN, targetdir=ctx.targetdir, samdb_fill=FILL_SUBDOMAIN,
machinepass=ctx.acct_pass, serverrole="domain controller", machinepass=ctx.acct_pass, serverrole="domain controller",
lp=ctx.lp, hostip=ctx.names.hostip, hostip6=ctx.names.hostip6) lp=ctx.lp, hostip=ctx.names.hostip, hostip6=ctx.names.hostip6)
@ -892,7 +902,6 @@ def join_subdomain(server=None, creds=None, lp=None, site=None, netbios_name=Non
ctx.partition_dn = "CN=%s,CN=Partitions,%s" % (ctx.domain_name, ctx.config_dn) ctx.partition_dn = "CN=%s,CN=Partitions,%s" % (ctx.domain_name, ctx.config_dn)
ctx.base_dn = samba.dn_from_dns_name(dnsdomain) ctx.base_dn = samba.dn_from_dns_name(dnsdomain)
ctx.domsid = str(security.random_sid()) ctx.domsid = str(security.random_sid())
ctx.domguid = str(uuid.uuid4())
ctx.acct_dn = None ctx.acct_dn = None
ctx.dnshostname = "%s.%s" % (ctx.myname, ctx.dnsdomain) ctx.dnshostname = "%s.%s" % (ctx.myname, ctx.dnsdomain)
ctx.trustdom_pass = samba.generate_random_password(128, 128) ctx.trustdom_pass = samba.generate_random_password(128, 128)