sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r14986: Fix OS/2 directory delete bug found by kukks.

Browse Source 
(Thanks a lot for all your hard work on this).
We were caching the results of *all* directory
scans, not just the results that match the
client wildcard. This actually made no sense,
as only matches on the client wildcard can be
returned to the client and so might need to
be searched for in the cache. This fixes the
directory cache to only cache entries that we
return to the client.
Jeremy.
(This used to be commit c88af597d0)
This commit is contained in:
Jeremy Allison 2006-04-08 05:00:04 +00:00 committed by Gerald (Jerry) Carter
parent 4ee43dbd47
commit 876f2deb3a
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
source3/smbd/dir.c
View File

@ -644,6 +644,15 @@ BOOL dptr_SearchDir(struct dptr_struct *dptr, const char *name, long *poffset, S
return False;
}
/****************************************************************************
Add the name we're returning into the underlying cache.
****************************************************************************/
void dptr_DirCacheAdd(struct dptr_struct *dptr, const char *name, long offset)
{
DirCacheAdd(dptr->dir_hnd, name, offset);
}
/****************************************************************************
Fill the 5 byte server reserved dptr field.
****************************************************************************/
@ -812,6 +821,8 @@ BOOL get_dir_entry(connection_struct *conn,char *mask,uint32 dirtype, pstring fn
DEBUG(3,("get_dir_entry mask=[%s] found %s fname=%s\n",mask, pathreal,fname));
found = True;
DirCacheAdd(conn->dirptr->dir_hnd, dname, curoff);
}
}
@ -1109,21 +1120,15 @@ const char *ReadDirName(struct smb_Dir *dirp, long *poffset)
}
while ((n = vfs_readdirname(conn, dirp->dir))) {
struct name_cache_entry *e;
/* Ignore . and .. - we've already returned them. */
if (*n == '.') {
if ((n[1] == '\0') || (n[1] == '.' && n[2] == '\0')) {
continue;
}
}
dirp->offset = SMB_VFS_TELLDIR(conn, dirp->dir);
dirp->name_cache_index = (dirp->name_cache_index+1) % NAME_CACHE_SIZE;
e = &dirp->name_cache[dirp->name_cache_index];
SAFE_FREE(e->name);
e->name = SMB_STRDUP(n);
*poffset = e->offset= dirp->offset;
*poffset = dirp->offset = SMB_VFS_TELLDIR(conn, dirp->dir);
dirp->file_number++;
return e->name;
return n;
}
*poffset = dirp->offset = END_OF_DIRECTORY_OFFSET;
return NULL;
@ -1183,6 +1188,21 @@ long TellDir(struct smb_Dir *dirp)
return(dirp->offset);
}
/*******************************************************************
Add an entry into the dcache.
********************************************************************/
void DirCacheAdd(struct smb_Dir *dirp, const char *name, long offset)
{
struct name_cache_entry *e;
dirp->name_cache_index = (dirp->name_cache_index+1) % NAME_CACHE_SIZE;
e = &dirp->name_cache[dirp->name_cache_index];
SAFE_FREE(e->name);
e->name = SMB_STRDUP(name);
e->offset = offset;
}
/*******************************************************************
Find an entry by name. Leave us at the offset after it.
Don't check for veto or invisible files.

2
source3/smbd/trans2.c
View File

@ -1163,6 +1163,8 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
DEBUG(5,("get_lanman2_dir_entry found %s fname=%s\n",pathreal,fname));
found = True;
dptr_DirCacheAdd(conn->dirptr, dname, curr_dirpos);
}
}