summaryrefslogtreecommitdiff
path: root/source4/scripting/python
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-08-25 19:13:34 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-09-13 15:37:12 +1000
commit840448eae81542b78c22d4b2bc93281c39688007 (patch)
tree596c26e19ab952e7da8db0551dd99059c3ce8f19 /source4/scripting/python
parent846e34264828e725ad32897aafbdfd6c0334a7a9 (diff)
downloadsamba-840448eae81542b78c22d4b2bc93281c39688007.tar.gz
samba-840448eae81542b78c22d4b2bc93281c39688007.tar.bz2
samba-840448eae81542b78c22d4b2bc93281c39688007.zip
s4-join supply the NTDS GUID to the provision
Unlike other join operations, the creation of a subdomain makes local changes to the DB, so we need to pass in the NTDS GUID to ensure the one set on the object created in the parent domain is the one that is used. Andrew Bartlett
Diffstat (limited to 'source4/scripting/python')
-rw-r--r--source4/scripting/python/samba/join.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py
index 1759990deb..2967ddf7e7 100644
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -440,7 +440,7 @@ class dc_join(object):
serverdn=ctx.server_dn, domain=ctx.domain_name,
hostname=ctx.myname, domainsid=ctx.domsid,
machinepass=ctx.acct_pass, serverrole="domain controller",
- sitename=ctx.site, lp=ctx.lp)
+ sitename=ctx.site, lp=ctx.lp, ntdsguid=ctx.ntds_guid)
print "Provision OK for domain DN %s" % presult.domaindn
ctx.local_samdb = presult.samdb
ctx.lp = presult.lp