summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-10-22 15:54:57 +1100
committerAndrew Tridgell <tridge@samba.org>2009-10-23 15:41:00 +1100
commite5b86d267465dba57b26a74f75ddc1e778359b23 (patch)
tree8b5deda4340d8f5dfebe0f5241982110695f82c1 /source4/scripting
parentbd9aa4d561df738331b65ad05abcbd7672cd0493 (diff)
downloadsamba-e5b86d267465dba57b26a74f75ddc1e778359b23.tar.gz
samba-e5b86d267465dba57b26a74f75ddc1e778359b23.tar.bz2
samba-e5b86d267465dba57b26a74f75ddc1e778359b23.zip
s4:dsdb Split schema loading and schema data management
By splitting the module this way, we can load the schema at startup, after the partitions module is operational, but we leave the 'mess with details of entries in the partitions' module to operate only on the partitions module. Loading the schema later allows us to set the @ATTRIBUTES correctly on all the databases. Andrew Bartlett
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/provision.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index f3011521d4..4df1188156 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -678,8 +678,9 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
"linked_attributes",
"extended_dn_out_ldb"]
modules_list2 = ["show_deleted",
+ "schema_load",
"new_partition",
- "partition"]
+ "partition"]
ldap_backend_line = "# No LDAP backend"
if ldap_backend is not None:
ldap_backend_line = "ldapBackend: %s" % ldap_backend.ldapi_uri
@@ -712,7 +713,7 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
"SCHEMADN_MOD2": ",objectguid",
"CONFIGDN": ldb.Dn(schema.ldb, names.configdn).get_casefold(),
"DOMAINDN": ldb.Dn(schema.ldb, names.domaindn).get_casefold(),
- "SCHEMADN_MOD": "schema_fsmo",
+ "SCHEMADN_MOD": "schema_data",
"CONFIGDN_MOD": "naming_fsmo",
"DOMAINDN_MOD": "pdc_fsmo",
"MODULES_LIST": ",".join(modules_list),