From a2a4aba5fd7a2ec0a7131f32c8bccd5dbe04e1f1 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 3 Dec 2007 05:51:04 +0100
Subject: 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)
---
 source4/scripting/libjs/provision.js    | 34 +++++++++++++++++----------------
 source4/setup/provision                 |  1 +
 source4/setup/provision_partitions.ldif |  2 +-
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/source4/scripting/libjs/provision.js b/source4/scripting/libjs/provision.js
index 08407418d3..0a064de68d 100644
--- 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 010f7e7708..9d818fdc18 100755
--- 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 674e16713d..fb8bc7f595 100644
--- 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}
-- 
cgit