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

[metze at samba.org]

Author: metze
Date: 2006-12-17 13:20:57 +0000 (Sun, 17 Dec 2006)
New Revision: 20224

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

Log:
the struct element msDs_Schema_Extensions and the attribute name "msDs-Schema-Extensions"
doesn't match so we need to pass 2 parameters to the GET_BLOB() macro

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


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/schema/schema_init.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/schema/schema_init.c	2006-12-17 13:05:34 UTC (rev 20223)
+++ branches/SAMBA_4_0/source/dsdb/schema/schema_init.c	2006-12-17 13:20:57 UTC (rev 20224)
@@ -141,9 +141,9 @@
 	(p)->elem = samdb_result_guid(msg, #elem);\
 } while (0)
 
-#define GET_BLOB(p, elem) do { \
+#define GET_BLOB(p, elem, attr) do { \
 	const struct ldb_val *_val;\
-	_val = ldb_msg_find_ldb_val(msg, #elem);\
+	_val = ldb_msg_find_ldb_val(msg, attr);\
 	if (_val) {\
 		(p)->elem = *_val;\
 		(void)talloc_steal(p, (p)->elem.data);\
@@ -175,7 +175,7 @@
 	status = dsdb_map_oid2int(attr->attributeSyntax_oid, &attr->attributeSyntax_id);
 	W_ERROR_NOT_OK_RETURN(status);
 	GET_UINT32(attr, oMSyntax);
-	GET_BLOB(attr, oMObjectClass);
+	GET_BLOB(attr, oMObjectClass, "oMObjectClass");
 
 	GET_BOOL(attr, isSingleValued, True);
 	GET_UINT32(attr, rangeLower);
@@ -183,7 +183,7 @@
 	GET_BOOL(attr, extendedCharsAllowed, False);
 
 	GET_UINT32(attr, schemaFlagsEx);
-	GET_BLOB(attr, msDs_Schema_Extensions);
+	GET_BLOB(attr, msDs_Schema_Extensions, "msDs-Schema-Extensions");
 
 	GET_BOOL(attr, showInAdvancedViewOnly, False);
 	GET_STRING(attr, adminDisplayName, True);
@@ -226,7 +226,7 @@
 	GET_STRING(obj, defaultSecurityDescriptor, False);
 
 	GET_UINT32(obj, schemaFlagsEx);
-	GET_BLOB(obj, msDs_Schema_Extensions);
+	GET_BLOB(obj, msDs_Schema_Extensions, "msDs-Schema-Extensions");
 
 	GET_BOOL(obj, showInAdvancedViewOnly, False);
 	GET_STRING(obj, adminDisplayName, True);