summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-01-30 00:36:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:55:15 -0500
commit91bf6cb6bfbc519773d0ffcd1d41100f14247d18 (patch)
tree7a2d47df36197a68188e641e357bf842ff22918d
parentd225b74b6dd4fa4cc0795f3b46d34187ffc63a43 (diff)
downloadsamba-91bf6cb6bfbc519773d0ffcd1d41100f14247d18.tar.gz
samba-91bf6cb6bfbc519773d0ffcd1d41100f14247d18.tar.bz2
samba-91bf6cb6bfbc519773d0ffcd1d41100f14247d18.zip
r5100: We should only care about case-sensitivity when *reading* an incoming
filename, not returning one. Makes us pass one more Samba4 RAW-SEARCH test. Jeremy. (This used to be commit 228d1e1649a0b4952eb5603cb5e1851cdc8f0c72)
-rw-r--r--source3/lib/util.c4
-rw-r--r--source3/smbd/reply.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index d910dff547..42ead313a9 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -617,7 +617,7 @@ void unix_clean_name(char *s)
Make a dir struct.
****************************************************************************/
-void make_dir_struct(char *buf, const char *mask, const char *fname,SMB_OFF_T size,int mode,time_t date, BOOL case_sensitive)
+void make_dir_struct(char *buf, const char *mask, const char *fname,SMB_OFF_T size,int mode,time_t date)
{
char *p;
pstring mask2;
@@ -641,7 +641,7 @@ void make_dir_struct(char *buf, const char *mask, const char *fname,SMB_OFF_T si
put_dos_date(buf,22,date);
SSVAL(buf,26,size & 0xFFFF);
SSVAL(buf,28,(size >> 16)&0xFFFF);
- push_ascii(buf+30,fname,12, case_sensitive ? 0 : STR_UPPER);
+ push_ascii(buf+30,fname,12,0);
DEBUG(8,("put name [%s] from [%s] into dir struct\n",buf+30, fname));
}
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 81e579e97c..56d4271213 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -910,7 +910,7 @@ int reply_search(connection_struct *conn, char *inbuf,char *outbuf, int dum_size
if (ok) {
if ((dirtype&0x1F) == aVOLID) {
memcpy(p,status,21);
- make_dir_struct(p,"???????????",volume_label(SNUM(conn)),0,aVOLID,0,conn->case_sensitive);
+ make_dir_struct(p,"???????????",volume_label(SNUM(conn)),0,aVOLID,0);
dptr_fill(p+12,dptr_num);
if (dptr_zero(p+12) && (status_len==0))
numentries = 1;
@@ -930,7 +930,7 @@ int reply_search(connection_struct *conn, char *inbuf,char *outbuf, int dum_size
finished = !get_dir_entry(conn,mask,dirtype,fname,&size,&mode,&date,check_descend);
if (!finished) {
memcpy(p,status,21);
- make_dir_struct(p,mask,fname,size,mode,date,conn->case_sensitive);
+ make_dir_struct(p,mask,fname,size,mode,date);
dptr_fill(p+12,dptr_num);
numentries++;
p += DIR_STRUCT_SIZE;