summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-12-29 04:21:32 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-12-29 04:21:32 +0000
commitd90e41600629f963d8bd3b9bda98260d70130947 (patch)
treef423d6462dd9876022011d8495763f08d74d27bf
parent5dff713735627288d69b55afeb540582a5b33d1a (diff)
downloadsamba-d90e41600629f963d8bd3b9bda98260d70130947.tar.gz
samba-d90e41600629f963d8bd3b9bda98260d70130947.tar.bz2
samba-d90e41600629f963d8bd3b9bda98260d70130947.zip
Add the alignment required before all 2-byte quantities in NDR. Allows us
to correctly parse plaintext netlogon calls with odd-length passwords Andrew Bartlett (This used to be commit de3c3cbeeb8b674ffc0dd8fe16913f15edcf9022)
-rw-r--r--source3/rpc_parse/parse_net.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/rpc_parse/parse_net.c b/source3/rpc_parse/parse_net.c
index 5df75fc5f6..89673dd0e3 100644
--- a/source3/rpc_parse/parse_net.c
+++ b/source3/rpc_parse/parse_net.c
@@ -1540,6 +1540,9 @@ BOOL net_io_q_sam_logon(const char *desc, NET_Q_SAM_LOGON *q_l, prs_struct *ps,
if(!smb_io_sam_info("", &q_l->sam_id, ps, depth))
return False;
+ if(!prs_align_uint16(ps))
+ return False;
+
if(!prs_uint16("validation_level", ps, depth, &q_l->validation_level))
return False;