diff options
author | Jeremy Allison <jra@samba.org> | 2002-12-31 02:26:15 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2002-12-31 02:26:15 +0000 |
commit | bb9c3a01e7b1c0c3fa25dd60a09bf2635ae5daf2 (patch) | |
tree | 88cad29466046146135a13177d6a796074acfbb1 /source3/rpc_parse/parse_samr.c | |
parent | 64501e44ee672936b206ed2d80e13e4c39bbd95c (diff) | |
download | samba-bb9c3a01e7b1c0c3fa25dd60a09bf2635ae5daf2.tar.gz samba-bb9c3a01e7b1c0c3fa25dd60a09bf2635ae5daf2.tar.bz2 samba-bb9c3a01e7b1c0c3fa25dd60a09bf2635ae5daf2.zip |
Merge tridge's fix :
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)
Diffstat (limited to 'source3/rpc_parse/parse_samr.c')
-rw-r--r-- | source3/rpc_parse/parse_samr.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index d5ca78bda4..61b13d1350 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -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; |