diff options
author | Stefan Metzmacher <metze@samba.org> | 2019-04-30 14:21:22 +0200 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2019-08-08 07:30:11 +0000 |
commit | d2087e4b4806940ef398d97133a3842a40951810 (patch) | |
tree | 0a06e9f153782ba4d42507c094f842a0b4f6a653 /librpc | |
parent | e7dfe3f7f77d42991dd32095dced1ac821ddeab0 (diff) | |
download | samba-d2087e4b4806940ef398d97133a3842a40951810.tar.gz |
dnsp.idl: fix the dnsp_dns_addr_array definition
The endian changes are needed in order to get the following result
from the blobs Windows generated (see the torture test):
AddrArray: ARRAY(3)
AddrArray: struct dnsp_dns_addr
family : 0x0002 (2)
port : 0x0035 (53)
ipv4 : 172.31.99.33
ipv6 : 0000:0000:0000:0000:0000:0000:0000:0000
[MS-DNSP] states that the port is supposed to be ignored, but it's still
good to decode it as port '53' (0x0035) instead of '13568' (0x3500).
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13969
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
(cherry picked from commit 6fc7cc15048673d109042d7b40684ed63eb4ff9e)
Diffstat (limited to 'librpc')
-rw-r--r-- | librpc/idl/dnsp.idl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/librpc/idl/dnsp.idl b/librpc/idl/dnsp.idl index 578cb27d4d1..0f71aaa292f 100644 --- a/librpc/idl/dnsp.idl +++ b/librpc/idl/dnsp.idl @@ -174,8 +174,8 @@ interface dnsp typedef struct { uint16 family; - uint16 port; - ipv4address ipv4; + [flag(NDR_BIG_ENDIAN)] uint16 port; + [flag(NDR_BIG_ENDIAN)] ipv4address ipv4; ipv6address ipv6; uint8 pad[8]; uint32 unused[8]; @@ -187,6 +187,7 @@ interface dnsp uint32 Tag; uint16 Family; uint16 Reserved0; + uint32 Flags; uint32 MatchFlag; uint32 Reserved1; uint32 Reserved2; |