mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
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 commit is contained in:
parent
175ec3ed51
commit
228d1e1649
@ -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));
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user