r20560: make it possible to configure the backend and modules

for all partitions and make it not use LDAP in the variable names
because it isn't specific to the ldap backend case.

metze
(This used to be commit 3e337ec2764038e4ff05c3e926220abaa5583702)

2 files changed, 18 insertions, 12 deletions

diff --git a/source4/setup/provision b/source4/setup/provision
index 8f1d422f51..dcc92b924f 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -113,18 +113,24 @@ for (r in options) {
 	var key = strupper(join("", split("-", r)));
 	subobj[key] = options[r];
 }
+
+var blank = (options["blank"] != undefined);
+var ldapbase = (options["ldap-base"] != undefined);
+var ldapbackend = (options["ldap-backend"] != undefined);
+var ldapmodule = (options["ldap-module"] != undefined);
+
 if (options["aci"] != undefined) {
 	println("set ACI: " + subobj["ACI"]);
 }
 
-if (options["ldap-backend"] != undefined) {
-	subobj["LDAPMODULES"] = subobj["LDAPMODULE"] + ",paged_searches";
+if (ldapbackend) {
+	if (!ldapmodule) {
+		subobj["LDAPMODULE"] = "objectUUID";
+	}
+	subobj["DOMAINDN_LDB"] = subobj["LDAPBACKEND"];
+	subobj["DOMAINDN_MOD"] = subobj["LDAPMODULE"] + ",paged_searches";
 }
 
-var blank = (options["blank"] != undefined);
-var ldapbase = (options["ldap-base"] != undefined);
-var ldapbackend = (options["ldap-backend"] != undefined);
-
 if (!provision_validate(subobj, message)) {
 	return -1;
 }
diff --git a/source4/setup/provision_partitions.ldif b/source4/setup/provision_partitions.ldif
index b713e4e31d..3988c16610 100644
--- a/source4/setup/provision_partitions.ldif
+++ b/source4/setup/provision_partitions.ldif
@@ -1,13 +1,13 @@
 dn: @PARTITION
-partition: ${SCHEMADN}:schema.ldb
-partition: ${CONFIGDN}:configuration.ldb
-partition: ${DOMAINDN}:${LDAPBACKEND}
+partition: ${SCHEMADN}:${SCHEMADN_LDB}
+partition: ${CONFIGDN}:${CONFIGDN_LDB}
+partition: ${DOMAINDN}:${DOMAINDN_LDB}
 replicateEntries: @SUBCLASSES
 replicateEntries: @ATTRIBUTES
 replicateEntries: @INDEXLIST
-modules:${SCHEMADN}:objectguid
-modules:${CONFIGDN}:objectguid
-modules:${DOMAINDN}:${LDAPMODULES}
+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