sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

r6022: Fix for bug #2533. Incorrect dir listings from OS/2 clients.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison
2005-03-24 02:23:32 +00:00
committed by Gerald (Jerry) Carter
parent 4868e42027
commit cf8949f684
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/lib/util.c
View File

@ -641,7 +641,9 @@ 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,0);
/* We only uppercase if the protocol is downrev.
Strange, but verified on W2K3. Needed for OS/2. JRA. */
push_ascii(buf+30,fname,12,Protocol < PROTOCOL_NT1 ? STR_UPPER : 0);
DEBUG(8,("put name [%s] from [%s] into dir struct\n",buf+30, fname));
}

7
source/smbd/dir.c
View File

@ -713,16 +713,11 @@ BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype, pstring fname
SMB_STRUCT_STAT sbuf;
pstring path;
pstring pathreal;
BOOL isrootdir;
pstring filename;
BOOL needslash;
*path = *pathreal = *filename = 0;
isrootdir = (strequal(conn->dirpath,"./") ||
strequal(conn->dirpath,".") ||
strequal(conn->dirpath,"/"));
needslash = ( conn->dirpath[strlen(conn->dirpath) -1] != '/');
if (!conn->dirptr)
@ -747,8 +742,6 @@ BOOL get_dir_entry(connection_struct *conn,char *mask,int dirtype, pstring fname
if ((strcmp(mask,"*.*") == 0) ||
mask_match(filename,mask,False) ||
mangle_mask_match(conn,filename,mask)) {
if (isrootdir && (strequal(filename,"..") || strequal(filename,".")))
continue;
if (!mangle_is_8_3(filename, False))
mangle_map(filename,True,False,SNUM(conn));