summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-11-23 20:30:35 +1100
committerStefan Metzmacher <metze@samba.org>2009-11-23 14:15:07 +0100
commit401ba9c9cf357d6b420a7401fc1a915871d96f8d (patch)
tree0bf733a327ce712e4d815b0a62e3f2278780a4ae /source4/setup
parente297af00fad2032e79f1889fd6d2713932249bb0 (diff)
downloadsamba-401ba9c9cf357d6b420a7401fc1a915871d96f8d.tar.gz
samba-401ba9c9cf357d6b420a7401fc1a915871d96f8d.tar.bz2
samba-401ba9c9cf357d6b420a7401fc1a915871d96f8d.zip
s4:dsdb Move module configuration from each ldb into samba_dsdb.c
This makes getting the module order correct, the obligation of Samba4 developers, and not system administrators. In particular, once an ldb is updated to use only the 'samba_dsdb' module, no further changes to the ldb should be required when upgrading to later Samba4 versions. (thanks to metze for the suggestion of samba_dsdb as a long-term stable name for the module) Andrew Bartlett
Diffstat (limited to 'source4/setup')
-rw-r--r--source4/setup/provision_init.ldif7
-rw-r--r--source4/setup/provision_partitions.ldif6
2 files changed, 7 insertions, 6 deletions
diff --git a/source4/setup/provision_init.ldif b/source4/setup/provision_init.ldif
index 3fcb97aa11..d9ec28624b 100644
--- a/source4/setup/provision_init.ldif
+++ b/source4/setup/provision_init.ldif
@@ -20,3 +20,10 @@ passwordAttribute: initialAuthIncoming
dn: @OPTIONS
checkBaseOnSearch: TRUE
+
+dn: @SAMBA_DSDB
+backendType: ${BACKEND_TYPE}
+serverRole: ${SERVER_ROLE}
+
+dn: @MODULES
+@LIST: samba_dsdb
diff --git a/source4/setup/provision_partitions.ldif b/source4/setup/provision_partitions.ldif
index 294b33c31e..728f32739d 100644
--- a/source4/setup/provision_partitions.ldif
+++ b/source4/setup/provision_partitions.ldif
@@ -2,11 +2,5 @@ dn: @PARTITION
replicateEntries: @ATTRIBUTES
replicateEntries: @INDEXLIST
replicateEntries: @OPTIONS
-modules:${SCHEMADN}:${SCHEMADN_MOD},${BACKEND_MOD}
-modules:${CONFIGDN}:${CONFIGDN_MOD},${BACKEND_MOD}
-modules:${DOMAINDN}:${DOMAINDN_MOD},${BACKEND_MOD}
-modules:*:${BACKEND_MOD}
${LDAP_BACKEND_LINE}
-dn: @MODULES
-@LIST: ${MODULES_LIST}