svn commit: samba r20382 - in branches/SAMBA_4_0/source/dsdb/schema: .

[metze at samba.org]

Author: metze
Date: 2006-12-28 13:06:29 +0000 (Thu, 28 Dec 2006)
New Revision: 20382

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20382

Log:
systemAuxiliaryClass and auxiliaryClass are also multivalued attributes

metze
Modified:
   branches/SAMBA_4_0/source/dsdb/schema/schema.h
   branches/SAMBA_4_0/source/dsdb/schema/schema_init.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/schema/schema.h
===================================================================
--- branches/SAMBA_4_0/source/dsdb/schema/schema.h	2006-12-28 12:54:55 UTC (rev 20381)
+++ branches/SAMBA_4_0/source/dsdb/schema/schema.h	2006-12-28 13:06:29 UTC (rev 20382)
@@ -77,12 +77,12 @@
 
 	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;

Modified: branches/SAMBA_4_0/source/dsdb/schema/schema_init.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/schema/schema_init.c	2006-12-28 12:54:55 UTC (rev 20381)
+++ branches/SAMBA_4_0/source/dsdb/schema/schema_init.c	2006-12-28 13:06:29 UTC (rev 20382)
@@ -305,15 +305,15 @@
  
 	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 @@
  
 	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);