[SCM] Samba Shared Repository - branch master updated - f52fc2f90ebf314de71f7150093bd641c3989b3c

[Andrew Bartlett]

The branch, master has been updated
       via  f52fc2f90ebf314de71f7150093bd641c3989b3c (commit)
      from  6f9e7505b29da753d98dba4de98e2dbf7e6b6b2b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f52fc2f90ebf314de71f7150093bd641c3989b3c
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Dec 19 09:47:59 2008 +1100

    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

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/python/samba/provision.py |    2 ++
 source4/setup/aggregate_schema.ldif         |    3 +++
 source4/setup/schema.ldif                   |    3 ---
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 source4/setup/aggregate_schema.ldif


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index b81f618..3711ed7 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 0000000..2726704
--- /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 40ef709..56eb7ce 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


-- 
Samba Shared Repository