svn commit: samba r6063 - in branches/SAMBA_3_0/source/smbd: .

[jra at samba.org]

Author: jra
Date: 2005-03-25 19:52:01 +0000 (Fri, 25 Mar 2005)
New Revision: 6063

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6063

Log:
Fix for bug #2533 - ensure SMBsearch unsets UNICODE flags2 bit as this SMB is
DOS codepage only.
Jeremy.               

Modified:
   branches/SAMBA_3_0/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/reply.c	2005-03-25 14:37:10 UTC (rev 6062)
+++ branches/SAMBA_3_0/source/smbd/reply.c	2005-03-25 19:52:01 UTC (rev 6063)
@@ -1090,7 +1090,10 @@
 
 	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);