summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-12-19 09:47:59 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-12-19 09:51:42 +1100
commitf52fc2f90ebf314de71f7150093bd641c3989b3c (patch)
treedf7868a41621418f8a59b2f73778a414a0419db4
parent6f9e7505b29da753d98dba4de98e2dbf7e6b6b2b (diff)
downloadsamba-f52fc2f90ebf314de71f7150093bd641c3989b3c.tar.gz
samba-f52fc2f90ebf314de71f7150093bd641c3989b3c.tar.bz2
samba-f52fc2f90ebf314de71f7150093bd641c3989b3c.zip
Move aggregate schema stub to it's own file
This should make it easier to import just the schema entries from the WSPP docs. Andrew Bartlett
-rw-r--r--source4/scripting/python/samba/provision.py2
-rw-r--r--source4/setup/aggregate_schema.ldif3
-rw-r--r--source4/setup/schema.ldif3
3 files changed, 5 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index b81f618a48..3711ed7bab 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -830,6 +830,8 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
message("Setting up sam.ldb AD schema")
setup_add_ldif(samdb, setup_path("schema.ldif"),
{"SCHEMADN": names.schemadn})
+ setup_add_ldif(samdb, setup_path("aggregate_schema.ldif"),
+ {"SCHEMADN": names.schemadn})
message("Setting up sam.ldb configuration data")
setup_add_ldif(samdb, setup_path("provision_configuration.ldif"), {
diff --git a/source4/setup/aggregate_schema.ldif b/source4/setup/aggregate_schema.ldif
new file mode 100644
index 0000000000..2726704719
--- /dev/null
+++ b/source4/setup/aggregate_schema.ldif
@@ -0,0 +1,3 @@
+dn: CN=Aggregate,${SCHEMADN}
+objectClass: top
+objectClass: subSchema
diff --git a/source4/setup/schema.ldif b/source4/setup/schema.ldif
index 40ef709ac3..56eb7ce0c0 100644
--- a/source4/setup/schema.ldif
+++ b/source4/setup/schema.ldif
@@ -10373,6 +10373,3 @@ systemFlags: 16
defaultHidingValue: TRUE
defaultObjectCategory: CN=Group-Policy-Container,${SCHEMADN}
-dn: CN=Aggregate,${SCHEMADN}
-objectClass: top
-objectClass: subSchema