sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-23 09:57:40 +03:00
Code

Merge tridge's fix :

Browse Source 
the 'padding' field in the query domain info reply is not a padding
field at all. It seems to be an optional 12 byte structure of some
kind. mkaplan found a situation where the structure was not present at
all (depending on ptr_0)
Jeremy.
(This used to be commit 3b453a596323867d4954b688dc3d83201096a447)
This commit is contained in:
Jeremy Allison 2002-12-31 02:26:15 +00:00
parent 64501e44ee
commit bb9c3a01e7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/rpc_parse/parse_samr.c
View File

@ -745,8 +745,14 @@ static BOOL sam_io_unk_info2(char *desc, SAM_UNK_INFO_2 * u_2,
if(!prs_uint32("num_local_grps", ps, depth, &u_2->num_local_grps))
return False;
if(!prs_uint8s(False, "padding", ps, depth, u_2->padding,sizeof(u_2->padding)))
return False;
if (u_2->ptr_0) {
/* this was originally marked as 'padding'. It isn't
padding, it is some sort of optional 12 byte
structure. When it is present it contains zeros
!? */
if(!prs_uint8s(False, "unknown", ps, depth, u_2->padding,sizeof(u_2->padding)))
return False;
}
if(!smb_io_unistr2("uni_domain", &u_2->uni_domain, u_2->hdr_domain.buffer, ps, depth))
return False;