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

VFS: Modify opendir to take a const struct smb_filename * instead of const char *

Browse Source 
Preparing to reduce use of lp_posix_pathnames().

Uses the same techniques as commit 616d068f0c
(synthetic_smb_fname()) to cope with modules that
modify the incoming pathname.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison
2016-02-26 14:53:12 -08:00
committed by Ralph Boehme
parent fb4778f4e9
commit c74ae37fe6
23 changed files with 284 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source3/modules/vfs_shadow_copy2.c
View File

@ -690,31 +690,44 @@ static void convert_sbuf(vfs_handle_struct *handle, const char *fname,
}
static DIR *shadow_copy2_opendir(vfs_handle_struct *handle,
const char *fname,
const char *mask,
uint32_t attr)
const struct smb_filename *smb_fname,
const char *mask,
uint32_t attr)
{
time_t timestamp;
char *stripped;
DIR *ret;
int saved_errno;
char *conv;
struct smb_filename *conv_smb_fname = NULL;
if (!shadow_copy2_strip_snapshot(talloc_tos(), handle, fname,
&timestamp, &stripped)) {
if (!shadow_copy2_strip_snapshot(talloc_tos(),
handle,
smb_fname->base_name,
&timestamp,
&stripped)) {
return NULL;
}
if (timestamp == 0) {
return SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
return SMB_VFS_NEXT_OPENDIR(handle, smb_fname, mask, attr);
}
conv = shadow_copy2_convert(talloc_tos(), handle, stripped, timestamp);
TALLOC_FREE(stripped);
if (conv == NULL) {
return NULL;
}
ret = SMB_VFS_NEXT_OPENDIR(handle, conv, mask, attr);
conv_smb_fname = synthetic_smb_fname(talloc_tos(),
conv,
NULL,
NULL);
if (conv_smb_fname == NULL) {
TALLOC_FREE(conv);
return NULL;
}
ret = SMB_VFS_NEXT_OPENDIR(handle, conv_smb_fname, mask, attr);
saved_errno = errno;
TALLOC_FREE(conv);
TALLOC_FREE(conv_smb_fname);
errno = saved_errno;
return ret;
}
@ -1372,6 +1385,7 @@ static int shadow_copy2_get_shadow_copy_data(
{
DIR *p;
const char *snapdir;
struct smb_filename *snapdir_smb_fname = NULL;
struct dirent *d;
TALLOC_CTX *tmp_ctx = talloc_stackframe();
bool ret;
@ -1392,7 +1406,17 @@ static int shadow_copy2_get_shadow_copy_data(
return -1;
}
p = SMB_VFS_NEXT_OPENDIR(handle, snapdir, NULL, 0);
snapdir_smb_fname = synthetic_smb_fname(talloc_tos(),
snapdir,
NULL,
NULL);
if (snapdir_smb_fname == NULL) {
errno = ENOMEM;
talloc_free(tmp_ctx);
return -1;
}
p = SMB_VFS_NEXT_OPENDIR(handle, snapdir_smb_fname, NULL, 0);
if (!p) {
DEBUG(2,("shadow_copy2: SMB_VFS_NEXT_OPENDIR() failed for '%s'"