s4:dsdb: Remove unused code

This code has not served a purpose since 2010, when commit
6a2f7fe04c2c658e59fba01f7346303676b121b3 removed
dsdb_class_from_drsuapi().

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15852

Signed-off-by: Jennifer Sutton <jennifersutton@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h
index 700f40414c8d013555195c938808a6362dffdaf5..e2e174f3450ed968b3c5488ba7d933a6a35da52c 100644 (file)
--- a/source4/dsdb/schema/schema.h
+++ b/source4/dsdb/schema/schema.h
@@ -168,16 +168,6 @@ struct dsdb_class {
        bool isDefunct;
        bool systemOnly;
 
-       uint32_t subClassOf_id;
-       uint32_t *systemAuxiliaryClass_ids;
-       uint32_t *auxiliaryClass_ids;
-       uint32_t *systemMayContain_ids;
-       uint32_t *systemMustContain_ids;
-       uint32_t *possSuperiors_ids;
-       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

diff --git a/source4/dsdb/schema/schema_inferiors.c b/source4/dsdb/schema/schema_inferiors.c
index 031bd5d012f6c579b57e071cbb890b88ed2db6d2..133b169d823618e976b8912e97afcf1304fc6599 100644 (file)
--- a/source4/dsdb/schema/schema_inferiors.c
+++ b/source4/dsdb/schema/schema_inferiors.c
@@ -228,92 +228,6 @@ static void schema_fill_possible_inferiors(const struct dsdb_schema *schema,
        schema_class->possibleInferiors = str_list_unique(poss_inf);
 }
 
-/*
-  fill in a string class name from a governs_ID
- */
-static void schema_fill_from_class_one(const struct dsdb_schema *schema,
-                                      const struct dsdb_class *c,
-                                      const char **s,
-                                      const uint32_t id)
-{
-       if (*s == NULL && id != 0) {
-               const struct dsdb_class *c2 =
-                                       dsdb_class_by_governsID_id(schema, id);
-               if (c2) {
-                       *s = c2->lDAPDisplayName;
-               }
-       }
-}
-
-/*
-  fill in a list of string class names from a governs_ID list
- */
-static void schema_fill_from_class_list(const struct dsdb_schema *schema,
-                                       const struct dsdb_class *c,
-                                       const char ***s,
-                                       const uint32_t *ids)
-{
-       if (*s == NULL && ids != NULL) {
-               unsigned int i;
-               for (i=0;ids[i];i++) ;
-               *s = talloc_array(c, const char *, i+1);
-               for (i=0;ids[i];i++) {
-                       const struct dsdb_class *c2 =
-                               dsdb_class_by_governsID_id(schema, ids[i]);
-                       if (c2) {
-                               (*s)[i] = c2->lDAPDisplayName;
-                       } else {
-                               (*s)[i] = NULL;                         
-                       }
-               }
-               (*s)[i] = NULL;                         
-       }
-}
-
-/*
-  fill in a list of string attribute names from a attributeID list
- */
-static void schema_fill_from_attribute_list(const struct dsdb_schema *schema,
-                                           const struct dsdb_class *c,
-                                           const char ***s,
-                                           const uint32_t *ids)
-{
-       if (*s == NULL && ids != NULL) {
-               unsigned int i;
-               for (i=0;ids[i];i++) ;
-               *s = talloc_array(c, const char *, i+1);
-               for (i=0;ids[i];i++) {
-                       const struct dsdb_attribute *a =
-                               dsdb_attribute_by_attributeID_id(schema, ids[i]);
-                       if (a) {
-                               (*s)[i] = a->lDAPDisplayName;
-                       } else {
-                               (*s)[i] = NULL;                         
-                       }
-               }
-               (*s)[i] = NULL;                         
-       }
-}
-
-/*
-  if the schema came from DRS then some attributes will be setup as IDs
- */
-static void schema_fill_from_ids(const struct dsdb_schema *schema)
-{
-       struct dsdb_class *c;
-       for (c=schema->classes; c; c=c->next) {
-               schema_fill_from_class_one(schema, c, &c->subClassOf, c->subClassOf_id);
-               schema_fill_from_attribute_list(schema, c, &c->systemMayContain, c->systemMayContain_ids);
-               schema_fill_from_attribute_list(schema, c, &c->systemMustContain, c->systemMustContain_ids);
-               schema_fill_from_attribute_list(schema, c, &c->mustContain, c->mustContain_ids);
-               schema_fill_from_attribute_list(schema, c, &c->mayContain, c->mayContain_ids);
-               schema_fill_from_class_list(schema, c, &c->possSuperiors, c->possSuperiors_ids);
-               schema_fill_from_class_list(schema, c, &c->systemPossSuperiors, c->systemPossSuperiors_ids);
-               schema_fill_from_class_list(schema, c, &c->systemAuxiliaryClass, c->systemAuxiliaryClass_ids);
-               schema_fill_from_class_list(schema, c, &c->auxiliaryClass, c->auxiliaryClass_ids);
-       }
-}
-
 int schema_fill_constructed(const struct dsdb_schema *schema)
 {
        int ret;
@@ -324,8 +238,6 @@ int schema_fill_constructed(const struct dsdb_schema *schema)
                ZERO_STRUCT(schema_class->tmp);
        }
 
-       schema_fill_from_ids(schema);
-
        ret = schema_create_subclasses(schema);
        if (ret != LDB_SUCCESS) {
                return ret;