r20554: - use ${ROOTDN} for the rootDomainNamingContext

- the ${CONFIGDN} is a child of the ${ROOTDN}

metze
(This used to be commit ebbd8a83c982efdc58e53798d1fd191f08731005)

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 80362ce7f2d83cb1d0f62bce27cac80ffd7b4195..60ab6f709305863207fc6af8a88428947f49e4de 100644 (file)
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -697,7 +697,8 @@ function provision_guess()
                                      subobj.DNSDOMAIN);
        rdn_list = split(".", subobj.DNSDOMAIN);
        subobj.BASEDN       = "DC=" + join(",DC=", rdn_list);
-       subobj.CONFIGDN     = "CN=Configuration," + subobj.BASEDN;
+       subobj.ROOTDN       = subobj.ROOTDN;
+       subobj.CONFIGDN     = "CN=Configuration," + subobj.ROOTDN;
        subobj.SCHEMADN     = "CN=Schema," + subobj.CONFIGDN;
        subobj.LDAPBACKEND  = "users.ldb";
        subobj.LDAPMODULE = "entryUUID";

diff --git a/source4/setup/provision_init.ldif b/source4/setup/provision_init.ldif
index 92fc17822f4f7856e0af90ae733c6e29ec73fcfd..5f57651f166f65dd23b5fafad058f4e28da42961 100644 (file)
--- a/source4/setup/provision_init.ldif
+++ b/source4/setup/provision_init.ldif
@@ -47,7 +47,7 @@ dn: cn=ROOTDSE
 subschemaSubentry: CN=Aggregate,${SCHEMADN}
 dsServiceName: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
 defaultNamingContext: ${BASEDN}
-rootDomainNamingContext: ${BASEDN}
+rootDomainNamingContext: ${ROOTDN}
 configurationNamingContext: ${CONFIGDN}
 schemaNamingContext: ${SCHEMADN}
 supportedLDAPVersion: 3