svn commit: samba r8677 - in branches/SAMBA_4_0/source: scripting/libjs setup

[abartlet at samba.org]

Author: abartlet
Date: 2005-07-21 11:28:24 +0000 (Thu, 21 Jul 2005)
New Revision: 8677

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8677

Log:
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

Modified:
   branches/SAMBA_4_0/source/scripting/libjs/provision.js
   branches/SAMBA_4_0/source/setup/provision.ldif


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js	2005-07-21 10:57:52 UTC (rev 8676)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js	2005-07-21 11:28:24 UTC (rev 8677)
@@ -268,6 +268,7 @@
 	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 @@
 				      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;
 }
 

Modified: branches/SAMBA_4_0/source/setup/provision.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision.ldif	2005-07-21 10:57:52 UTC (rev 8676)
+++ branches/SAMBA_4_0/source/setup/provision.ldif	2005-07-21 11:28:24 UTC (rev 8677)
@@ -5,9 +5,8 @@
 objectClass: top
 objectClass: domain
 objectClass: domainDNS
-flatname: ${DOMAIN}
 dnsDomain: ${DNSDOMAIN}
-dc: ${DOMAIN}
+dc: ${RDN_DC}
 objectGUID: ${DOMAINGUID}
 creationTime: ${NTTIME}
 forceLogoff: 0x8000000000000000