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

[abartlet at samba.org]

Author: abartlet
Date: 2006-07-31 01:00:18 +0000 (Mon, 31 Jul 2006)
New Revision: 17330

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

Log:
Enable the partitions module.

This module redirects various samdb requests into different modules,
depending on the prefix.  It also makes moving to an LDAP backend
easier, as it is just a different partition backend.

This adds yet another stage to the provision process, as we must setup
the partitions before we setup the magic attributes.

Andrew Bartlett

Added:
   branches/SAMBA_4_0/source/setup/provision_partitions.ldif
Modified:
   branches/SAMBA_4_0/source/scripting/libjs/provision.js
   branches/SAMBA_4_0/source/setup/provision_init.ldif


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/libjs/provision.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/provision.js	2006-07-30 19:22:39 UTC (rev 17329)
+++ branches/SAMBA_4_0/source/scripting/libjs/provision.js	2006-07-31 01:00:18 UTC (rev 17330)
@@ -479,8 +479,11 @@
 	message("Setting up hklm.ldb\n");
 	setup_ldb("hklm.ldif", info, paths.hklm);
 
+	message("Setting up sam.ldb partitions\n");
+	setup_ldb("provision_partitions.ldif", info, paths.samdb);
+
 	message("Setting up sam.ldb attributes\n");
-	setup_ldb("provision_init.ldif", info, paths.samdb);
+	setup_ldb("provision_init.ldif", info, paths.samdb, NULL, false);
 	message("Erasing data from partitions\n");
 	ldb_erase_partitions(info, paths.samdb);
 	

Modified: branches/SAMBA_4_0/source/setup/provision_init.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision_init.ldif	2006-07-30 19:22:39 UTC (rev 17329)
+++ branches/SAMBA_4_0/source/setup/provision_init.ldif	2006-07-31 01:00:18 UTC (rev 17330)
@@ -55,14 +55,10 @@
 passwordAttribute: sambaLMPwdHistory
 passwordAttribute: krb5key
 
-
 # the rootDSE module looks in this record for its base data
 dn: cn=ROOTDSE
 subschemaSubentry: CN=Aggregate,CN=Schema,CN=Configuration,${BASEDN}
 dsServiceName: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,${BASEDN}
-namingContexts: ${BASEDN}
-namingContexts: CN=Configuration,${BASEDN}
-namingContexts: CN=Schema,CN=Configuration,${BASEDN}
 defaultNamingContext: ${BASEDN}
 rootDomainNamingContext: ${BASEDN}
 configurationNamingContext: CN=Configuration,${BASEDN}
@@ -78,13 +74,3 @@
 vendorName: Samba Team (http://samba.org)
 vendorVersion: ${VERSION}
 
-#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)
-
-dn: @MODULES
- at LIST: rootdse,kludge_acl,paged_results,server_sort,extended_dn,asq,samldb,objectclass,password_hash,operational,objectguid,rdn_name
-

Added: branches/SAMBA_4_0/source/setup/provision_partitions.ldif
===================================================================
--- branches/SAMBA_4_0/source/setup/provision_partitions.ldif	2006-07-30 19:22:39 UTC (rev 17329)
+++ branches/SAMBA_4_0/source/setup/provision_partitions.ldif	2006-07-31 01:00:18 UTC (rev 17330)
@@ -0,0 +1,19 @@
+dn: @PARTITION
+partition: CN=Schema,CN=Configuration,${BASEDN}:schema.ldb
+partition: CN=Configuration,${BASEDN}:configuration.ldb
+partition: CN=Templates,${BASEDN}:templates.ldb
+partition: ${BASEDN}:${LDAPBACKEND}
+replicateEntries: @SUBCLASSES
+replicateEntries: @ATTRIBUTES
+replicateEntries: @INDEXLIST
+
+#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
+ at LIST: rootdse,kludge_acl,paged_results,server_sort,extended_dn,asq,samldb,objectguid,password_hash,operational,objectclass,rdn_name,partition