s4:schema Add code to provide an index into the subClass tree

In time, this should avoid the astounding (order) complexity of the
objectclass sorting in objectclass.c eventually.

Andrew Bartlett

diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h
index a605e2f707fe21fbbc58af6df8335540d1668ad3..4e7e503931978e4227b84afb27433b2370992f43 100644 (file)
--- a/source4/dsdb/schema/schema.h
+++ b/source4/dsdb/schema/schema.h
@@ -146,6 +146,13 @@ struct dsdb_class {
        uint32_t *mustContain_ids;
        uint32_t *mayContain_ids;
        uint32_t *systemPossSuperiors_ids;
+
+       /* An ordered index showing how this subClass fits into the
+        * subClass tree.  that is, an objectclass that is not
+        * subClassOf anything is 0 (just in case), and top is 1, and
+        * subClasses of top are 2, subclasses of those classes are
+        * 3 */ 
+       uint32_t subClass_order;
 };
 
 struct dsdb_schema_oid_prefix {

diff --git a/source4/dsdb/schema/schema_inferiors.c b/source4/dsdb/schema/schema_inferiors.c
index b0ecc08600be69401397b0b712417cf351270207..493b425b726d52d774a4333eb16984f8a3ef0376 100644 (file)
--- a/source4/dsdb/schema/schema_inferiors.c
+++ b/source4/dsdb/schema/schema_inferiors.c
@@ -127,6 +127,20 @@ static char **schema_subclasses_recurse(struct dsdb_schema *schema, struct dsdb_
        return list;
 }
 
+/* Walk down the subClass tree, setting a higher index as we go down
+ * each level.  top is 1, subclasses of top are 2, etc */
+void schema_subclasses_order_recurse(struct dsdb_schema *schema, struct dsdb_class *schema_class, int order)
+{
+       const char **list = schema_class->subclasses_direct;
+       int i;
+       schema_class->subClass_order = order;
+       for (i=0;list && list[i]; i++) {
+               struct dsdb_class *schema_class2 = dsdb_class_by_lDAPDisplayName(schema, list[i]);
+               schema_subclasses_order_recurse(schema, schema_class2, order+1);
+       }
+       return;
+}
+
 static void schema_create_subclasses(struct dsdb_schema *schema)
 {
        struct dsdb_class *schema_class;
@@ -148,7 +162,12 @@ static void schema_create_subclasses(struct dsdb_schema *schema)
 
        for (schema_class=schema->classes; schema_class; schema_class=schema_class->next) {
                schema_class->subclasses = str_list_unique(schema_subclasses_recurse(schema, schema_class));
-       }       
+
+               /* Initilise the subClass order, to ensure we can't have uninitilised sort on the subClass hirarchy */
+               schema_class->subClass_order = 0;
+       }
+
+       schema_subclasses_order_recurse(schema, dsdb_class_by_lDAPDisplayName(schema, "top"), 1);
 }
 
 static void schema_fill_possible_inferiors(struct dsdb_schema *schema, struct dsdb_class *schema_class)