r26245: Make it easier to handle the LDAP backend, with it's differing needs,

by seperating the modules list into parts.  That way, we can remove
the modules that the backend will provide.

Andrew Bartlett
(This used to be commit d67e5c7896f6d3064298897ae4d3204498824b06)

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 08407418d3d70e3694c7e5f1d3253c46127aec97..0a064de68db96fa97266cdc33373ad33423afa0f 100644 (file)
--- a/source4/scripting/libjs/provision.js
+++ b/source4/scripting/libjs/provision.js
@@ -977,23 +977,25 @@ function provision_guess()
        //   module when expanding the objectclass list)
        // - partition must be last
        // - each partition has its own module list then
-       modules_list        = new Array("rootdse",
-                                       "paged_results",
-                                       "ranged_results",
-                                       "server_sort",
-                                       "extended_dn",
-                                       "asq",
-                                       "samldb",
-                                       "rdn_name",
-                                       "objectclass",
-                                       "kludge_acl",
-                                       "operational",
-                                       "subtree_rename",
-                                       "subtree_delete",
-                                       "linked_attributes",
-                                       "show_deleted",
-                                       "partition");
+       var modules_list     = new Array("rootdse",
+                                        "paged_results",
+                                        "ranged_results",
+                                        "server_sort",
+                                        "extended_dn",
+                                        "asq",
+                                        "samldb",
+                                        "rdn_name",
+                                        "objectclass",
+                                        "kludge_acl",
+                                        "operational");
+       var tdb_modules_list = new Array("subtree_rename",
+                                        "subtree_delete",
+                                        "linked_attributes");
+       var modules_list2    = new Array("show_deleted",
+                                        "partition");
        subobj.MODULES_LIST = join(",", modules_list);
+       subobj.TDB_MODULES_LIST = "," + join(",", tdb_modules_list);
+       subobj.MODULES_LIST2 = join(",", modules_list2);
        subobj.DOMAINDN_LDB = "users.ldb";
        subobj.CONFIGDN_LDB = "configuration.ldb";
        subobj.SCHEMADN_LDB = "schema.ldb";

diff --git a/source4/setup/provision b/source4/setup/provision
index 010f7e7708dea3a862536dc128e70ecc9b297cbd..9d818fdc180af2873f4ce640d60383ec994264ee 100755 (executable)
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -142,6 +142,7 @@ if (ldapbackend) {
        }
        if (!ldapmodule) {
                subobj.LDAPMODULE = "entryuuid";
+               subobj.TDB_MODULES_LIST = "";
        }
        subobj.DOMAINDN_LDB = subobj.LDAPBACKEND;
        subobj.DOMAINDN_MOD2 = "," + subobj.LDAPMODULE + ",paged_searches";

diff --git a/source4/setup/provision_partitions.ldif b/source4/setup/provision_partitions.ldif
index 674e16713d501df766e2f10a1d3e89448f40080a..fb8bc7f595c985877037cbeadd410e6559683401 100644 (file)
--- a/source4/setup/provision_partitions.ldif
+++ b/source4/setup/provision_partitions.ldif
@@ -10,4 +10,4 @@ modules:${CONFIGDN}:${CONFIGDN_MOD}${CONFIGDN_MOD2}
 modules:${DOMAINDN}:${DOMAINDN_MOD}${DOMAINDN_MOD2}
 
 dn: @MODULES
-@LIST: ${MODULES_LIST}
+@LIST: ${MODULES_LIST}${TDB_MODULES_LIST},${MODULES_LIST2}