summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2003-06-06 04:31:48 +0000
committerAndrew Tridgell <tridge@samba.org>2003-06-06 04:31:48 +0000
commit32bf831e25718653c955fea10d4f6b1b8ca7a192 (patch)
tree7a1f77be99f2921ca781ec5330e5470c51f90d43 /source3/smbd
parentd51b463b3fa8915c99857a5cb0a051e2fb957e74 (diff)
downloadsamba-32bf831e25718653c955fea10d4f6b1b8ca7a192.tar.gz
samba-32bf831e25718653c955fea10d4f6b1b8ca7a192.tar.bz2
samba-32bf831e25718653c955fea10d4f6b1b8ca7a192.zip
fixed the string alignment of the QUERY_EA_SIZE trans2 findfirst level
(This used to be commit ff5e37ed293b61c2585c66e7366fae478754cca1)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/trans2.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 0aa0087c26..fa64883620 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -649,8 +649,7 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
SIVAL(p,l2_cbList,0); /* No extended attributes */
p += l2_achName;
nameptr = p;
- p += align_string(outbuf, p, 0);
- len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE);
+ len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE | STR_NOALIGN);
if (SVAL(outbuf, smb_flg2) & FLAGS2_UNICODE_STRINGS)
SCVAL(nameptr, -1, len-2);
else