summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-12-28 13:06:29 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:30:20 -0500
commit40e7f362126407361dbaa56977e6e2463038dbcc (patch)
tree9e3cd5c4eac9853e0bcf03b1abb73f4078169905
parent112d58a0c5dda18228fcbed8547cd6aacdd2e384 (diff)
downloadsamba-40e7f362126407361dbaa56977e6e2463038dbcc.tar.gz
samba-40e7f362126407361dbaa56977e6e2463038dbcc.tar.bz2
samba-40e7f362126407361dbaa56977e6e2463038dbcc.zip
r20382: systemAuxiliaryClass and auxiliaryClass are also multivalued attributes
metze (This used to be commit 5440c0a99fd8dced9020a47af4dbee74df504219)
-rw-r--r--source4/dsdb/schema/schema.h4
-rw-r--r--source4/dsdb/schema/schema_init.c32
2 files changed, 18 insertions, 18 deletions
diff --git a/source4/dsdb/schema/schema.h b/source4/dsdb/schema/schema.h
index 34cfcdb401..4911407a21 100644
--- 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 eff7a3c185..a2843385b8 100644
--- 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);