sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

vfs_streams_depot: use OpenDir() in walk_streams()

Browse Source 
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Ralph Boehme 2020-03-19 12:03:27 +01:00 committed by Jeremy Allison
parent 7217694cab
commit 8339b485a6
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source3/modules/vfs_streams_depot.c
View File

@ -475,8 +475,9 @@ static NTSTATUS walk_streams(vfs_handle_struct *handle,
{
char *dirname;
struct smb_filename *dir_smb_fname = NULL;
DIR *dirhandle = NULL;
const char *dirent = NULL;
struct smb_Dir *dir_hnd = NULL;
const char *dname = NULL;
long offset = 0;
char *talloced = NULL;
dirname = stream_dir(handle, smb_fname_base, &smb_fname_base->st,
@ -504,33 +505,31 @@ static NTSTATUS walk_streams(vfs_handle_struct *handle,
return NT_STATUS_NO_MEMORY;
}
dirhandle = SMB_VFS_NEXT_OPENDIR(handle, dir_smb_fname, NULL, 0);
dir_hnd = OpenDir(talloc_tos(), handle->conn, dir_smb_fname, NULL, 0);
TALLOC_FREE(dir_smb_fname);
if (dirhandle == NULL) {
if (dir_hnd == NULL) {
TALLOC_FREE(dirname);
return map_nt_error_from_unix(errno);
}
while ((dirent = vfs_readdirname(handle->conn, dirhandle, NULL,
&talloced)) != NULL) {
if (ISDOT(dirent) || ISDOTDOT(dirent)) {
while ((dname = ReadDirName(dir_hnd, &offset, NULL, &talloced))
!= NULL)
{
if (ISDOT(dname) || ISDOTDOT(dname)) {
TALLOC_FREE(talloced);
continue;
}
DEBUG(10, ("walk_streams: dirent=%s\n", dirent));
DBG_DEBUG("dirent=%s\n", dname);
if (!fn(dirname, dirent, private_data)) {
if (!fn(dirname, dname, private_data)) {
TALLOC_FREE(talloced);
break;
}
TALLOC_FREE(talloced);
}
SMB_VFS_NEXT_CLOSEDIR(handle, dirhandle);
TALLOC_FREE(dir_hnd);
if (pdirname != NULL) {
*pdirname = dirname;