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

[metze at samba.org]

Author: metze
Date: 2007-01-05 20:31:24 +0000 (Fri, 05 Jan 2007)
New Revision: 20565

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

Log:
configure the list of global ldb modules also in js code

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


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js	2007-01-05 20:23:48 UTC (rev 20564)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js	2007-01-05 20:31:24 UTC (rev 20565)
@@ -699,13 +699,36 @@
 	rdn_list = split(".", subobj.DNSDOMAIN);
 	subobj.DOMAINDN     = "DC=" + join(",DC=", rdn_list);
 	subobj.DOMAINDN_LDB = "users.ldb";
-	subobj.DOMAINDN_MOD = "objectguid";
 	subobj.ROOTDN       = subobj.DOMAINDN;
 	subobj.CONFIGDN     = "CN=Configuration," + subobj.ROOTDN;
 	subobj.CONFIGDN_LDB = "configuration.ldb";
-	subobj.CONFIGDN_MOD = "objectguid";
 	subobj.SCHEMADN     = "CN=Schema," + subobj.CONFIGDN;
 	subobj.SCHEMADN_LDB = "schema.ldb";
+
+	//Add modules to the list to activate them by default
+	//beware often order is important
+	//
+	// Some Known ordering constraints:
+	// - rootdse must be first, as it makes redirects from "" -> cn=rootdse
+	// - samldb must be before password_hash, because password_hash checks
+	//   that the objectclass is of type person (filled in by samldb)
+	// - partition must be last
+	// - each partition has its own module list then
+	modules_list        = new Array("rootdse",
+					"kludge_acl",
+					"paged_results",
+					"server_sort",
+					"extended_dn",
+					"asq",
+					"samldb",
+					"password_hash",
+					"operational",
+					"objectclass",
+					"rdn_name",
+					"partition");
+	subobj.MODULES_LIST = join(",", modules_list);
+	subobj.DOMAINDN_MOD = "objectguid";
+	subobj.CONFIGDN_MOD = "objectguid";
 	subobj.SCHEMADN_MOD = "objectguid";
 
 	subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb";

Modified: branches/SAMBA_4_0/source/setup/provision_partitions.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision_partitions.ldif	2007-01-05 20:23:48 UTC (rev 20564)
+++ branches/SAMBA_4_0/source/setup/provision_partitions.ldif	2007-01-05 20:31:24 UTC (rev 20565)
@@ -9,13 +9,5 @@
 modules:${CONFIGDN}:${CONFIGDN_MOD}
 modules:${DOMAINDN}:${DOMAINDN_MOD}
 
-#Add modules to the list to activate them by default
-#beware often order is important
-#
-# Some Known ordering constraints:
-# - rootdse must be first, as it makes redirects from "" -> cn=rootdse
-# - samldb must be before password_hash, because password_hash checks that the objectclass is of type person (filled in by samldb)
-# - partition must be last
-
 dn: @MODULES
- at LIST: rootdse,kludge_acl,paged_results,server_sort,extended_dn,asq,samldb,password_hash,operational,objectclass,rdn_name,partition
+ at LIST: ${MODULES_LIST}