s4-provision: pass the rootDN into guess_names()
authorAndrew Tridgell <tridge@samba.org>
Mon, 22 Aug 2011 07:27:39 +0000 (17:27 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 24 Aug 2011 21:39:38 +0000 (07:39 +1000)
this gets the correct forest DN during provision

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

source4/scripting/python/samba/provision/__init__.py

index c414bd08f0ead8d366c5d003066c32f415ddf4a5..50dff9d08672ce720995f04cc8acbbbfe0fa97c8 100644 (file)
@@ -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