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

Merge of Jerry's fix from 2.2.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison -
parent e2a76a7fc9
commit 64af68924b
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/include/rpc_samr.h
View File

@ -1693,9 +1693,16 @@ typedef struct q_samr_get_dom_pwinfo
/* SAMR_R_GET_DOM_PWINFO */
typedef struct r_samr_get_dom_pwinfo
{
uint16 unk_0;
uint16 unk_1;
uint16 unk_2;
/*
* Previously this was 3 uint16's. However, after some tests
* it appears that the data len for the signing needs to be 16.
* Not sure how 3 unit16's ever worked since the length always
* turned out to 12. 3 uint32's + NT_STATUS == 16 bytes. Tested
* using NT and 2k. --jerry
*/
uint32 unk_0;
uint32 unk_1;
uint32 unk_2;
NTSTATUS status;
} SAMR_R_GET_DOM_PWINFO;

13
source/rpc_parse/parse_samr.c
View File

@ -6719,13 +6719,16 @@ BOOL samr_io_r_get_dom_pwinfo(char *desc, SAMR_R_GET_DOM_PWINFO * r_u,
if(!prs_align(ps))
return False;
if(!prs_uint16("unk_0", ps, depth, &r_u->unk_0))
/*
* We need 16 bytes here according to tests. Don't know
* what they are, but the length is important for the singing
*/
if(!prs_uint32("unk_0", ps, depth, &r_u->unk_0))
return False;
if(!prs_uint16("unk_1", ps, depth, &r_u->unk_1))
if(!prs_uint32("unk_1", ps, depth, &r_u->unk_1))
return False;
if(!prs_uint16("unk_2", ps, depth, &r_u->unk_2))
return False;
if(!prs_align(ps))
if(!prs_uint32("unk_2", ps, depth, &r_u->unk_2))
return False;
if(!prs_ntstatus("status", ps, depth, &r_u->status))