svn commit: samba r20417 - in branches/SAMBA_4_0/source/librpc: idl
ndr
metze at samba.org
metze at samba.org
Sat Dec 30 10:42:01 GMT 2006
Author: metze
Date: 2006-12-30 10:42:01 +0000 (Sat, 30 Dec 2006)
New Revision: 20417
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20417
Log:
- fix pushing of drsuapi_DsAttributeValueDataBlob
- make drsuapi_DsReplicaAttribute public so that the ndr_print_*
function can be used from the outside
metze
Modified:
branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl 2006-12-30 10:15:54 UTC (rev 20416)
+++ branches/SAMBA_4_0/source/librpc/idl/drsuapi.idl 2006-12-30 10:42:01 UTC (rev 20417)
@@ -436,7 +436,7 @@
/* Generic DATA_BLOB values */
typedef struct {
- [range(0,10485760)] uint32 length;
+ [range(0,10485760),value(ndr_size_DATA_BLOB(0,r->data,0))] uint32 length;
DATA_BLOB *data;
} drsuapi_DsAttributeValueDataBlob;
@@ -600,7 +600,7 @@
[default] drsuapi_DsAttributeValueCtrDataBlob data_blob;
} drsuapi_DsReplicaAttributeValueCtr;
- typedef struct {
+ typedef [public] struct {
drsuapi_DsAttributeId attid;
[switch_is(attid)] drsuapi_DsReplicaAttributeValueCtr value_ctr;
} drsuapi_DsReplicaAttribute;
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c 2006-12-30 10:15:54 UTC (rev 20416)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_basic.c 2006-12-30 10:42:01 UTC (rev 20417)
@@ -846,5 +846,6 @@
_PUBLIC_ uint32_t ndr_size_DATA_BLOB(int ret, const DATA_BLOB *data, int flags)
{
+ if (!data) return ret;
return ret + data->length;
}
More information about the samba-cvs
mailing list