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

metze
(This used to be commit cbebe559a2563a3ab9dd2e002c79676a803b71a4)

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 461550d5b5a1fd8814f889aad94fdcfcc19f8965..731f95c6de404701e6f05cb36c5b6789348982a8 100644 (file)
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -699,13 +699,36 @@ function provision_guess()
        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";

diff --git a/source4/setup/provision_partitions.ldif b/source4/setup/provision_partitions.ldif
index 3988c1661072f236d186dbc241376b7c8a4c367d..3800918bc129f0a989c2abe371ad9210852404b8 100644 (file)
--- a/source4/setup/provision_partitions.ldif
+++ b/source4/setup/provision_partitions.ldif
@@ -9,13 +9,5 @@ modules:${SCHEMADN}:${SCHEMADN_MOD}
 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
-@LIST: rootdse,kludge_acl,paged_results,server_sort,extended_dn,asq,samldb,password_hash,operational,objectclass,rdn_name,partition
+@LIST: ${MODULES_LIST}