summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2004-01-05 23:20:59 +0000
committerAndrew Bartlett <abartlet@samba.org>2004-01-05 23:20:59 +0000
commit1ba7740fd61ff7e10e5efe6a9e4d2a8c669fc82e (patch)
tree5ec3a7f253a4cc5159b82f348494e7099e16f31c
parent239c4da56ca0827e39de5bec0a590d63ee476b24 (diff)
downloadsamba-1ba7740fd61ff7e10e5efe6a9e4d2a8c669fc82e.tar.gz
samba-1ba7740fd61ff7e10e5efe6a9e4d2a8c669fc82e.tar.bz2
samba-1ba7740fd61ff7e10e5efe6a9e4d2a8c669fc82e.zip
(merge from 3.0)
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 39d8a9e488eb31796e8e7eca42fe27f8218ce5d6)
-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;