From e046b382f24f507a19bfb020b145ea2ec8acafcb Mon Sep 17 00:00:00 2001 From: Aravind Srinivasan Date: Wed, 26 Aug 2009 14:56:09 -0700 Subject: s3: Add a new VFS op called SMB_VFS_TRANSLATE_NAME This vop is designed to work in tandem with SMB_VFS_READDIR to allow vfs modules to make modifications to arbitrary filenames before they're consumed by callers. Subsequently the core directory enumeration code in smbd is now changed to free the memory that may be allocated in a module. This vop enables the new version of catia in the following patch. Signed-off-by: Tim Prouty --- source3/modules/vfs_streams_depot.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source3/modules/vfs_streams_depot.c') diff --git a/source3/modules/vfs_streams_depot.c b/source3/modules/vfs_streams_depot.c index aa0189123b..51cd56e8fb 100644 --- a/source3/modules/vfs_streams_depot.c +++ b/source3/modules/vfs_streams_depot.c @@ -384,7 +384,7 @@ static NTSTATUS walk_streams(vfs_handle_struct *handle, { char *dirname; SMB_STRUCT_DIR *dirhandle = NULL; - char *dirent; + char *dirent = NULL; dirname = stream_dir(handle, smb_fname_base, &smb_fname_base->st, false); @@ -411,14 +411,17 @@ static NTSTATUS walk_streams(vfs_handle_struct *handle, while ((dirent = vfs_readdirname(handle->conn, dirhandle, NULL)) != NULL) { if (ISDOT(dirent) || ISDOTDOT(dirent)) { + TALLOC_FREE(dirent); continue; } DEBUG(10, ("walk_streams: dirent=%s\n", dirent)); if (!fn(dirname, dirent, private_data)) { + TALLOC_FREE(dirent); break; } + TALLOC_FREE(dirent); } SMB_VFS_NEXT_CLOSEDIR(handle, dirhandle); -- cgit