summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-05-05 00:26:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:51:25 -0500
commitdcdd94f20955e68b80769cb7ee42dd256e40da26 (patch)
tree585cf05309b3cc3d0f1cccf0978008b77857bd76
parent1843f6905caf30de6493de07316a416696394d3e (diff)
downloadsamba-dcdd94f20955e68b80769cb7ee42dd256e40da26.tar.gz
samba-dcdd94f20955e68b80769cb7ee42dd256e40da26.tar.bz2
samba-dcdd94f20955e68b80769cb7ee42dd256e40da26.zip
r480: Added Andrew Bartletts pwinfo-parse-error.patch.
Jeremy. (This used to be commit b9e79004a4c1e4a472f0627d2c33c966af22ccd2)
-rw-r--r--source3/include/rpc_samr.h3
-rw-r--r--source3/rpc_parse/parse_samr.c6
2 files changed, 4 insertions, 5 deletions
diff --git a/source3/include/rpc_samr.h b/source3/include/rpc_samr.h
index 111e62c355..089941de3a 100644
--- a/source3/include/rpc_samr.h
+++ b/source3/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/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c
index 287dc3bd7f..85eedc7baa 100644
--- a/source3/rpc_parse/parse_samr.c
+++ b/source3/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))