summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-09-24 17:21:47 -0700
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-10-02 12:45:05 +0200
commit4c235ca78728a472215bd761fe041efdb1831a07 (patch)
tree4ae63bb6b3d670eecbff2bef41c565dca9548a5a /source4/scripting
parentc7358d989034c9d936c04f2a7e4f89db252b798e (diff)
downloadsamba-4c235ca78728a472215bd761fe041efdb1831a07.tar.gz
samba-4c235ca78728a472215bd761fe041efdb1831a07.tar.bz2
samba-4c235ca78728a472215bd761fe041efdb1831a07.zip
s4:provision Ensure we add the schema with the 'relax' control
(allows addition of systemOnly classes)
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/provision.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index c14870ecd0..06b8288969 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -210,6 +210,8 @@ class Schema(object):
prefixmap = open(setup_path("prefixMap.txt"), 'r').read()
prefixmap = b64encode(prefixmap)
+
+
# We don't actually add this ldif, just parse it
prefixmap_ldif = "dn: cn=schema\nprefixMap:: %s\n\n" % prefixmap
self.ldb.set_schema_from_ldif(prefixmap_ldif, self.schema_data)
@@ -1052,10 +1054,10 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
# The LDIF here was created when the Schema object was constructed
message("Setting up sam.ldb schema")
- samdb.add_ldif(schema.schema_dn_add)
+ samdb.add_ldif(schema.schema_dn_add, controls=["relax:0"])
samdb.modify_ldif(schema.schema_dn_modify)
samdb.write_prefixes_from_schema()
- samdb.add_ldif(schema.schema_data)
+ samdb.add_ldif(schema.schema_data, controls=["relax:0"])
setup_add_ldif(samdb, setup_path("aggregate_schema.ldif"),
{"SCHEMADN": names.schemadn})