summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-08-22 17:27:39 +1000
committerAndrew Tridgell <tridge@samba.org>2011-08-25 07:39:38 +1000
commit53b08bfbdb68724aa7cfb26c9d53f6adf8373423 (patch)
tree1239a1952425cbc1a3d3e428afa4897e57c3e5fe
parent27656e912340bc4fa58799da569b7673b2d0adca (diff)
downloadsamba-53b08bfbdb68724aa7cfb26c9d53f6adf8373423.tar.gz
samba-53b08bfbdb68724aa7cfb26c9d53f6adf8373423.tar.bz2
samba-53b08bfbdb68724aa7cfb26c9d53f6adf8373423.zip
s4-provision: pass the rootDN into guess_names()
this gets the correct forest DN during provision Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source4/scripting/python/samba/provision/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index c414bd08f0..50dff9d086 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1061,7 +1061,7 @@ def setup_samdb_rootdse(samdb, names):
setup_add_ldif(samdb, setup_path("provision_rootdse_add.ldif"), {
"SCHEMADN": names.schemadn,
"DOMAINDN": names.domaindn,
- "ROOTDN": names.rootdn,
+ "ROOTDN" : names.rootdn,
"CONFIGDN": names.configdn,
"SERVERDN": names.serverdn,
})
@@ -1608,7 +1608,7 @@ def provision(logger, session_info, credentials, smbconf=None,
names = guess_names(lp=lp, hostname=hostname, domain=domain,
dnsdomain=realm, serverrole=serverrole, domaindn=domaindn,
configdn=configdn, schemadn=schemadn, serverdn=serverdn,
- sitename=sitename)
+ sitename=sitename, rootdn=rootdn)
paths = provision_paths_from_lp(lp, names.dnsdomain)
paths.bind_gid = bind_gid