r8677: The first part of the domain name may not be equal to the netbios domain name.

Remove the use of flatname from the main domain object, we no longer
reference it.

Andrew Bartlett
(This used to be commit 2303e24be74570187b23c3d31d0433263c83ba7e)

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 38f3fc066ebed101a52c20e27aca2d1404ed6296..b6a7c5978b5e82b343b60b33908a62e1c53be5f8 100644 (file)
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -268,6 +268,7 @@ function provision_guess()
        var subobj = new Object();
        var nss = nss_init();
        var lp = loadparm_init();
+       var rdn_list;
        random_init(local);
 
        subobj.REALM        = lp.get("realm");
@@ -302,6 +303,8 @@ function provision_guess()
                                      strlower(subobj.HOSTNAME), 
                                      subobj.DNSDOMAIN);
        subobj.BASEDN       = "DC=" + join(",DC=", split(".", subobj.REALM));
+       rdn_list = split(".", subobj.REALM);
+       subobj.RDN_DC       = rdn_list[0];
        return subobj;
 }
 

diff --git a/source4/setup/provision.ldif b/source4/setup/provision.ldif
index c42c73eda4cedd4d09efef381036fbf645749a6b..d70d936988871d7e3716aa41d3dcc81e549f8e33 100644 (file)
--- a/source4/setup/provision.ldif
+++ b/source4/setup/provision.ldif
@@ -5,9 +5,8 @@ dn: ${BASEDN}
 objectClass: top
 objectClass: domain
 objectClass: domainDNS
-flatname: ${DOMAIN}
 dnsDomain: ${DNSDOMAIN}
-dc: ${DOMAIN}
+dc: ${RDN_DC}
 objectGUID: ${DOMAINGUID}
 creationTime: ${NTTIME}
 forceLogoff: 0x8000000000000000