r20382: systemAuxiliaryClass and auxiliaryClass are also multivalued attributes

metze
(This used to be commit 5440c0a99fd8dced9020a47af4dbee74df504219)

diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h
index 34cfcdb401b958902d65bd97b4e24085220ef8d5..4911407a21dbe7a18083f1739dec00994a5e0e07 100644 (file)
--- a/source4/dsdb/schema/schema.h
+++ b/source4/dsdb/schema/schema.h
@@ -77,12 +77,12 @@ struct dsdb_class {
 
        const char *subClassOf;
 
-       const char *systemAuxiliaryClass;
+       const char **systemAuxiliaryClass;
        const char **systemPossSuperiors;
        const char **systemMustContain;
        const char **systemMayContain;
 
-       const char *auxiliaryClass;
+       const char **auxiliaryClass;
        const char **possSuperiors;
        const char **mustContain;
        const char **mayContain;

diff --git a/source4/dsdb/schema/schema_init.c b/source4/dsdb/schema/schema_init.c
index eff7a3c1855ad236065100028bbab477eff81d3b..a2843385b866d8ac708dad4fb4cbcf1c4c0db7da 100644 (file)
--- a/source4/dsdb/schema/schema_init.c
+++ b/source4/dsdb/schema/schema_init.c
@@ -305,15 +305,15 @@ WERROR dsdb_class_from_ldb(struct ldb_message *msg, TALLOC_CTX *mem_ctx, struct
  
        GET_STRING_LDB(msg, "subClassOf", mem_ctx, obj, subClassOf, True);
 
-       GET_STRING_LDB(msg, "systemAuxiliaryClass", mem_ctx, obj, systemAuxiliaryClass, False);
-       obj->systemPossSuperiors= NULL;
-       obj->systemMustContain  = NULL;
-       obj->systemMayContain   = NULL;
+       obj->systemAuxiliaryClass       = NULL;
+       obj->systemPossSuperiors        = NULL;
+       obj->systemMustContain          = NULL;
+       obj->systemMayContain           = NULL;
 
-       GET_STRING_LDB(msg, "auxiliaryClass", mem_ctx, obj, auxiliaryClass, False);
-       obj->possSuperiors      = NULL;
-       obj->mustContain        = NULL;
-       obj->mayContain         = NULL;
+       obj->auxiliaryClass             = NULL;
+       obj->possSuperiors              = NULL;
+       obj->mustContain                = NULL;
+       obj->mayContain                 = NULL;
 
        GET_STRING_LDB(msg, "defaultSecurityDescriptor", mem_ctx, obj, defaultSecurityDescriptor, False);
 
@@ -573,15 +573,15 @@ WERROR dsdb_class_from_drsuapi(struct dsdb_schema *schema,
  
        GET_STRING_DS(schema, r, "subClassOf", mem_ctx, obj, subClassOf, True);
 
-       GET_STRING_DS(schema, r, "systemAuxiliaryClass", mem_ctx, obj, systemAuxiliaryClass, False);
-       obj->systemPossSuperiors= NULL;
-       obj->systemMustContain  = NULL;
-       obj->systemMayContain   = NULL;
+       obj->systemAuxiliaryClass       = NULL;
+       obj->systemPossSuperiors        = NULL;
+       obj->systemMustContain          = NULL;
+       obj->systemMayContain           = NULL;
 
-       GET_STRING_DS(schema, r, "auxiliaryClass", mem_ctx, obj, auxiliaryClass, False);
-       obj->possSuperiors      = NULL;
-       obj->mustContain        = NULL;
-       obj->mayContain         = NULL;
+       obj->auxiliaryClass             = NULL;
+       obj->possSuperiors              = NULL;
+       obj->mustContain                = NULL;
+       obj->mayContain                 = NULL;
 
        GET_STRING_DS(schema, r, "defaultSecurityDescriptor", mem_ctx, obj, defaultSecurityDescriptor, False);