summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-03-25 19:52:01 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:20 -0500
commit10fe0ae721194157d87f306feab30b5f3f42c9b9 (patch)
tree631302ec6d2ad63fd45b3cfc879e8770b7775c53 /source3
parent78a3af6233627b7257c40ca040001bee6c6f9b3e (diff)
downloadsamba-10fe0ae721194157d87f306feab30b5f3f42c9b9.tar.gz
samba-10fe0ae721194157d87f306feab30b5f3f42c9b9.tar.bz2
samba-10fe0ae721194157d87f306feab30b5f3f42c9b9.zip
r6063: Fix for bug #2533 - ensure SMBsearch unsets UNICODE flags2 bit as this SMB is
DOS codepage only. Jeremy. (This used to be commit 56cc756b9d14db23b2640c347f729fa90dad9b6a)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/reply.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 17423c531d..6cc6a97afc 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1090,7 +1090,10 @@ int reply_search(connection_struct *conn, char *inbuf,char *outbuf, int dum_size
if (Protocol >= PROTOCOL_NT1)
SSVAL(outbuf,smb_flg2,SVAL(outbuf, smb_flg2) | FLAGS2_IS_LONG_NAME);
-
+
+ /* This SMB *always* returns ASCII names. Remove the unicode bit in flags2. */
+ SSVAL(outbuf,smb_flg2, (SVAL(outbuf, smb_flg2) & (~FLAGS2_UNICODE_STRINGS)));
+
outsize += DIR_STRUCT_SIZE*numentries;
smb_setlen(outbuf,outsize - 4);