svn commit: samba r20473 - in branches/SAMBA_4_0/source:
dsdb/schema librpc/idl
metze at samba.org
metze at samba.org
Tue Jan 2 13:18:10 GMT 2007
Author: metze
Date: 2007-01-02 13:18:09 +0000 (Tue, 02 Jan 2007)
New Revision: 20473
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20473
Log:
remove special case for boolean values
metze
Modified:
branches/SAMBA_4_0/source/dsdb/schema/schema_init.c
branches/SAMBA_4_0/source/dsdb/schema/schema_syntax.c
branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/schema/schema_init.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/schema/schema_init.c 2007-01-02 12:59:00 UTC (rev 20472)
+++ branches/SAMBA_4_0/source/dsdb/schema/schema_init.c 2007-01-02 13:18:09 UTC (rev 20473)
@@ -445,18 +445,24 @@
d_printf("%s: %s == NULL\n", __location__, attr); \
return WERR_INVALID_PARAM; \
} \
- if (strict && _a->value_ctr.uint32.num_values != 1) { \
+ if (strict && _a->value_ctr.data_blob.num_values != 1) { \
d_printf("%s: %s num_values == %u\n", __location__, attr, \
- _a->value_ctr.uint32.num_values); \
+ _a->value_ctr.data_blob.num_values); \
return WERR_INVALID_PARAM; \
} \
- if (strict && !_a->value_ctr.uint32.values[0].value) { \
- d_printf("%s: %s value == NULL\n", __location__, attr); \
+ if (strict && !_a->value_ctr.data_blob.values[0].data) { \
+ d_printf("%s: %s data == NULL\n", __location__, attr); \
return WERR_INVALID_PARAM; \
} \
- if (_a && _a->value_ctr.uint32.num_values >= 1 \
- && _a->value_ctr.uint32.values[0].value) { \
- (p)->elem = (*_a->value_ctr.uint32.values[0].value?True:False);\
+ if (strict && _a->value_ctr.data_blob.values[0].data->length != 4) { \
+ d_printf("%s: %s length == %u\n", __location__, attr, \
+ _a->value_ctr.data_blob.values[0].data->length); \
+ return WERR_INVALID_PARAM; \
+ } \
+ if (_a && _a->value_ctr.data_blob.num_values >= 1 \
+ && _a->value_ctr.data_blob.values[0].data \
+ && _a->value_ctr.data_blob.values[0].data->length == 4) { \
+ (p)->elem = (IVAL(_a->value_ctr.data_blob.values[0].data->data,0)?True:False);\
} else { \
(p)->elem = False; \
} \
Modified: branches/SAMBA_4_0/source/dsdb/schema/schema_syntax.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/schema/schema_syntax.c 2007-01-02 12:59:00 UTC (rev 20472)
+++ branches/SAMBA_4_0/source/dsdb/schema/schema_syntax.c 2007-01-02 13:18:09 UTC (rev 20473)
@@ -77,13 +77,6 @@
{
uint32_t i;
-switch (attr->attributeID_id) {
-case DRSUAPI_ATTRIBUTE_isSingleValued:
-case DRSUAPI_ATTRIBUTE_showInAdvancedViewOnly:
-case DRSUAPI_ATTRIBUTE_isMemberOfPartialAttributeSet:
- return dsdb_syntax_FOOBAR_drsuapi_to_ldb(schema,attr, in, mem_ctx, out);
-}
-
out->flags = 0;
out->name = talloc_strdup(mem_ctx, attr->lDAPDisplayName);
W_ERROR_HAVE_NO_MEMORY(out->name);
Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl 2007-01-02 12:59:00 UTC (rev 20472)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl 2007-01-02 13:18:09 UTC (rev 20473)
@@ -524,11 +524,6 @@
[case(DRSUAPI_ATTRIBUTE_attributeID)] drsuapi_DsAttributeValueCtrUINT32 oid;
[case(DRSUAPI_ATTRIBUTE_attributeSyntax)] drsuapi_DsAttributeValueCtrUINT32 oid;
- /* BOOL */
- [case(DRSUAPI_ATTRIBUTE_isSingleValued)] drsuapi_DsAttributeValueCtrUINT32 boolean;
- [case(DRSUAPI_ATTRIBUTE_showInAdvancedViewOnly)] drsuapi_DsAttributeValueCtrUINT32 boolean;
- [case(DRSUAPI_ATTRIBUTE_isMemberOfPartialAttributeSet)] drsuapi_DsAttributeValueCtrUINT32 boolean;
-
/* UINT32 */
[case(DRSUAPI_ATTRIBUTE_instanceType)] drsuapi_DsAttributeValueCtrUINT32 uint32;
[case(DRSUAPI_ATTRIBUTE_rangeLower)] drsuapi_DsAttributeValueCtrUINT32 uint32;
More information about the samba-cvs
mailing list