summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-08-10 08:44:04 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-08-10 10:18:28 +1000
commitfdd07e87c6fc7a4a0ea7c6f99080d78e526042e6 (patch)
tree1d5daf395827c0b602669bd0ee7bfdff3a7b6a34 /source4/scripting
parent1d1bdc315b4619f0ca5b2a0db602cbe283f8dca8 (diff)
downloadsamba-fdd07e87c6fc7a4a0ea7c6f99080d78e526042e6.tar.gz
samba-fdd07e87c6fc7a4a0ea7c6f99080d78e526042e6.tar.bz2
samba-fdd07e87c6fc7a4a0ea7c6f99080d78e526042e6.zip
s4-dsdb: Explain better what records are written during schema set
This is controlled by setting write_indices_and_attributes. Andrew Bartlett
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/provision/__init__.py6
-rw-r--r--source4/scripting/python/samba/samdb.py8
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 94e857e9f4..6834d40eb4 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1121,7 +1121,7 @@ def setup_samdb(path, session_info, provision_backend, lp, names,
logger.info("Pre-loading the Samba 4 and AD schema")
# Load the schema from the one we computed earlier
- samdb.set_schema(schema, write_attributes=False)
+ samdb.set_schema(schema, write_indices_and_attributes=False)
# Set the NTDS settings DN manually - in order to have it already around
# before the provisioned tree exists and we connect
@@ -1133,8 +1133,8 @@ def setup_samdb(path, session_info, provision_backend, lp, names,
# But we have to give it one more kick to have it use the schema
# during provision - it needs, now that it is connected, to write
- # the schema @INDEX records to the database.
- samdb.set_schema(schema, write_attributes=True)
+ # the schema @ATTRIBUTES and @INDEXLIST records to the database.
+ samdb.set_schema(schema, write_indices_and_attributes=True)
return samdb
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 3355e9a589..7db1b00754 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -608,11 +608,11 @@ accountExpires: %u
def load_partition_usn(self, base_dn):
return dsdb._dsdb_load_partition_usn(self, base_dn)
- def set_schema(self, schema, write_attributes=True):
- self.set_schema_from_ldb(schema.ldb, write_attributes=write_attributes)
+ def set_schema(self, schema, write_indices_and_attributes=True):
+ self.set_schema_from_ldb(schema.ldb, write_indices_and_attributes=write_indices_and_attributes)
- def set_schema_from_ldb(self, ldb_conn, write_attributes=True):
- dsdb._dsdb_set_schema_from_ldb(self, ldb_conn, write_attributes)
+ def set_schema_from_ldb(self, ldb_conn, write_indices_and_attributes=True):
+ dsdb._dsdb_set_schema_from_ldb(self, ldb_conn, write_indices_and_attributes)
def dsdb_DsReplicaAttribute(self, ldb, ldap_display_name, ldif_elements):
'''convert a list of attribute values to a DRSUAPI DsReplicaAttribute'''