diff options
| author | Jeremy Allison <jra@samba.org> | 2004-05-05 00:26:46 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2004-05-05 00:26:46 +0000 |
| commit | 0bad645c8c4d8d52ef4f9aa5401dfc828fbbd32e (patch) | |
| tree | f9596562db9e4acd0c0384874a1459d9c9134926 | |
| parent | c7cf544f5fd6f92a948b01112b7c9f41a9193fba (diff) | |
| download | samba-0bad645c8c4d8d52ef4f9aa5401dfc828fbbd32e.tar.gz samba-0bad645c8c4d8d52ef4f9aa5401dfc828fbbd32e.tar.xz samba-0bad645c8c4d8d52ef4f9aa5401dfc828fbbd32e.zip | |
r480: Added Andrew Bartletts pwinfo-parse-error.patch.
Jeremy.
| -rw-r--r-- | source/include/rpc_samr.h | 3 | ||||
| -rw-r--r-- | source/rpc_parse/parse_samr.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h index 111e62c3553..089941de3aa 100644 --- a/source/include/rpc_samr.h +++ b/source/include/rpc_samr.h @@ -1740,9 +1740,8 @@ typedef struct r_samr_get_dom_pwinfo * turned out to 12. 3 uint32's + NT_STATUS == 16 bytes. Tested * using NT and 2k. --jerry */ - uint32 unk_0; + uint16 unk_0; uint32 unk_1; - uint32 unk_2; NTSTATUS status; } SAMR_R_GET_DOM_PWINFO; diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c index 287dc3bd7f2..85eedc7baab 100644 --- a/source/rpc_parse/parse_samr.c +++ b/source/rpc_parse/parse_samr.c @@ -6928,11 +6928,11 @@ BOOL samr_io_r_get_dom_pwinfo(const char *desc, SAMR_R_GET_DOM_PWINFO * r_u, * what they are, but the length is important for the singing */ - if(!prs_uint32("unk_0", ps, depth, &r_u->unk_0)) + if(!prs_uint16("unk_0", ps, depth, &r_u->unk_0)) return False; - if(!prs_uint32("unk_1", ps, depth, &r_u->unk_1)) + if(!prs_align(ps)) return False; - if(!prs_uint32("unk_2", ps, depth, &r_u->unk_2)) + if(!prs_uint32("unk_1", ps, depth, &r_u->unk_1)) return False; if(!prs_ntstatus("status", ps, depth, &r_u->status)) |