From 1b9452ffc5d21bcc621806273a1ab0366843451f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 23 Nov 2003 07:14:17 +0000 Subject: fixed the handling of value() attributes on scalars in IDL that reference other elements of the same structure (This used to be commit d8d17be290730670bad0fea91188d394160cb879) --- source4/librpc/idl/dcerpc.idl | 10 +++++----- source4/librpc/idl/samr.idl | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/librpc') diff --git a/source4/librpc/idl/dcerpc.idl b/source4/librpc/idl/dcerpc.idl index 14518d6c3d..f24e6ffc45 100644 --- a/source4/librpc/idl/dcerpc.idl +++ b/source4/librpc/idl/dcerpc.idl @@ -84,17 +84,17 @@ interface dcerpc } dcerpc_pkt_type; typedef [nodiscriminant] union { - [case(DCERPC_PKT_REQUEST)] dcerpc_request request; + [case(DCERPC_PKT_REQUEST)] dcerpc_request request; [case(DCERPC_PKT_RESPONSE)] dcerpc_response response; - [case(DCERPC_PKT_BIND)] dcerpc_bind bind; + [case(DCERPC_PKT_BIND)] dcerpc_bind bind; [case(DCERPC_PKT_BIND_ACK)] dcerpc_bind_ack bind_ack; - [case(DCERPC_PKT_FAULT)] dcerpc_fault fault; + [case(DCERPC_PKT_FAULT)] dcerpc_fault fault; } dcerpc_payload; /* pfc_flags values */ - const uint8 DCERPC_PFC_FLAG_FIRST = 0x01; - const uint8 DCERPC_PFC_FLAG_LAST = 0x02; + const uint8 DCERPC_PFC_FLAG_FIRST = 0x01; + const uint8 DCERPC_PFC_FLAG_LAST = 0x02; const uint8 DCERPC_PFC_FLAG_NOCALL = 0x20; typedef [public] struct { diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl index eb1d126227..43db18a298 100644 --- a/source4/librpc/idl/samr.idl +++ b/source4/librpc/idl/samr.idl @@ -62,7 +62,7 @@ /* Function: 0x05 */ typedef struct { [value(2*strlen_m(r->name))] uint16 name_len; - [value(2*strlen_m(r->name))] uint16 name_size; + [value(r->name_len)] uint16 name_size; unistr_noterm *name; } samr_Name; -- cgit