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

[metze at samba.org]

Author: metze
Date: 2007-01-05 20:10:38 +0000 (Fri, 05 Jan 2007)
New Revision: 20560

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

Log:
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
Modified:
   branches/SAMBA_4_0/source/scripting/libjs/provision.js
   branches/SAMBA_4_0/source/setup/provision
   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 19:29:45 UTC (rev 20559)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js	2007-01-05 20:10:38 UTC (rev 20560)
@@ -508,7 +508,7 @@
 	var modify_ok = setup_ldb_modify("provision_basedn_modify.ldif", info, samdb);
 	if (!modify_ok) {
 		if (!add_ok) {
-			message("Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.LDAPBACKEND + "\n");
+			message("Failed to both add and modify " + subobj.DOMAINDN + " in target " + subobj.DOMAINDN_LDB + "\n");
 			message("Perhaps you need to run the provision script with the --ldap-base-dn option, and add this record to the backend manually\n"); 
 		};
 		assert(modify_ok);
@@ -691,20 +691,25 @@
 	subobj.WHEEL        = findnss(nss.getgrnam, "wheel", "root", "staff", "adm");
 	subobj.BACKUP       = findnss(nss.getgrnam, "backup", "wheel", "root", "staff");
 	subobj.USERS        = findnss(nss.getgrnam, "users", "guest", "other", "unknown", "usr");
+
 	subobj.DNSDOMAIN    = strlower(subobj.REALM);
 	subobj.DNSNAME      = sprintf("%s.%s", 
 				      strlower(subobj.HOSTNAME), 
 				      subobj.DNSDOMAIN);
 	rdn_list = split(".", subobj.DNSDOMAIN);
-	subobj.DOMAINDN       = "DC=" + join(",DC=", rdn_list);
+	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.LDAPBACKEND  = "users.ldb";
-	subobj.LDAPMODULE = "entryUUID";
-	subobj.LDAPMODULES = "objectguid";
+	subobj.SCHEMADN_LDB = "schema.ldb";
+	subobj.SCHEMADN_MOD = "objectguid";
+
 	subobj.EXTENSIBLEOBJECT = "# no objectClass: extensibleObject for local ldb";
-	subobj.ACI = "# no aci for local ldb";
+	subobj.ACI		= "# no aci for local ldb";
 	return subobj;
 }
 

Modified: branches/SAMBA_4_0/source/setup/provision
===================================================================
--- branches/SAMBA_4_0/source/setup/provision	2007-01-05 19:29:45 UTC (rev 20559)
+++ branches/SAMBA_4_0/source/setup/provision	2007-01-05 20:10:38 UTC (rev 20560)
@@ -113,18 +113,24 @@
 	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;
 }

Modified: branches/SAMBA_4_0/source/setup/provision_partitions.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision_partitions.ldif	2007-01-05 19:29:45 UTC (rev 20559)
+++ branches/SAMBA_4_0/source/setup/provision_partitions.ldif	2007-01-05 20:10:38 UTC (rev 20560)
@@ -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