From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 18 Dec 2008 22:47:59 +0000 (+1100)
Subject: Move aggregate schema stub to it's own file
X-Git-Tag: samba-4.0.0alpha6~467^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f52fc2f90ebf314de71f7150093bd641c3989b3c;p=thirdparty%2Fsamba.git

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
---

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index b81f618a484..3711ed7bab4 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 00000000000..2726704719d
--- /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 40ef709ac37..56eb7ce0c07 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