summaryrefslogtreecommitdiffstats
path: root/source4/scripting/python/samba/join.py
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-11-11 10:45:13 +1100
committerAndrew Tridgell <tridge@samba.org>2010-11-11 02:57:04 +0000
commit81c9b98ecd6b0b4ec412ea7a0963002dc17f4f66 (patch)
treef14941c8d1df3cf6f3c57efd3dbee6c74565aed2 /source4/scripting/python/samba/join.py
parent1d7d09a8f72a9f7f888538b7f7c63969407e9c2d (diff)
downloadsamba-81c9b98ecd6b0b4ec412ea7a0963002dc17f4f66.tar.gz
samba-81c9b98ecd6b0b4ec412ea7a0963002dc17f4f66.tar.xz
samba-81c9b98ecd6b0b4ec412ea7a0963002dc17f4f66.zip
s4-join: use the command line loadparm in provision during a join
this allows a join with an empty smb.conf to override locations of files correctly with --option Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/scripting/python/samba/join.py')
-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 571b822f50..bdd63db718 100644
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -412,7 +412,7 @@ class dc_join:
serverdn=ctx.server_dn, domain=ctx.domain_name,
hostname=ctx.myname, domainsid=ctx.domsid,
machinepass=ctx.acct_pass, serverrole="domain controller",
- sitename=ctx.site)
+ sitename=ctx.site, lp=ctx.lp)
print "Provision OK for domain DN %s" % presult.domaindn
ctx.local_samdb = presult.samdb
ctx.lp = presult.lp