diff options
| author | Stefan Metzmacher <metze@samba.org> | 2019-08-15 13:22:43 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2019-09-20 01:14:43 +0000 |
| commit | 8f0751b8b7cd45fc7186b467d814eb5231821e34 (patch) | |
| tree | c45802927863c8b929208b2ea6ff6286a084e176 /librpc | |
| parent | 0fea2707fb05897eec3c26bd4814669832142382 (diff) | |
| download | samba-8f0751b8b7cd45fc7186b467d814eb5231821e34.tar.gz | |
netlogon.idl: fix the marshalling of netr_trust_extension_container for NDR64
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>
Diffstat (limited to 'librpc')
| -rw-r--r-- | librpc/idl/netlogon.idl | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl index e6fda421ea5..be6e45054a9 100644 --- a/librpc/idl/netlogon.idl +++ b/librpc/idl/netlogon.idl @@ -1386,21 +1386,27 @@ interface netlogon } netr_WorkstationInfo; typedef struct { - /* these first 3 values come from the fact windows - actually encodes this structure as a UNICODE_STRING - - see MS-NRPC section 2.2.1.3.9 */ - [value(8)] uint32 length; - [value(0)] uint32 dummy; - [value(8)] uint32 size; netr_TrustFlags flags; uint32 parent_index; lsa_TrustType trust_type; lsa_TrustAttributes trust_attributes; + } netr_trust_extension_info; + + typedef struct { + /* these first 3 values come from the fact windows + actually encodes this structure as a UNICODE_STRING + - see MS-NRPC section 2.2.1.3.9 */ + [value(8)] uint3264 length; + [value(0)] uint3264 dummy; + [value(8)] uint3264 size; + [subcontext(0),subcontext_size(size*2)] + netr_trust_extension_info info; } netr_trust_extension; typedef struct { - uint16 length; /* value is 16 when info != NULL, otherwise 0 */ - [value(length)] uint16 size; /* value is 16 when info != NULL, otherwise 0 */ + /* value is 16 when info != NULL, otherwise 0 */ + [value(info == NULL ? 0 : 16)] uint16 length; + [value(info == NULL ? 0 : 16)] uint16 size; netr_trust_extension *info; } netr_trust_extension_container; |