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

s3: VFS: vfs_streams_depot. Wrap Convert streams_depot_unlink() -> streams_depot_unlink_internal() so we can add parameters.

Browse Source 
Make streams_depot_unlink() a wrapper calling the internal version.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2019-09-17 19:23:31 -07:00 committed by Ralph Boehme
parent c81932fdfe
commit 7b2fda0576
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/modules/vfs_streams_depot.c
View File

@ -691,8 +691,10 @@ static int streams_depot_open(vfs_handle_struct *handle,
return ret; return ret;
} }
static int streams_depot_unlink(vfs_handle_struct *handle, static int streams_depot_unlink_internal(vfs_handle_struct *handle,
const struct smb_filename *smb_fname) struct files_struct *dirfsp,
const struct smb_filename *smb_fname,
int flags)
{ {
struct smb_filename *smb_fname_base = NULL; struct smb_filename *smb_fname_base = NULL;
int ret = -1; int ret = -1;
@ -777,6 +779,15 @@ static int streams_depot_unlink(vfs_handle_struct *handle,
return ret; return ret;
} }
static int streams_depot_unlink(vfs_handle_struct *handle,
const struct smb_filename *smb_fname)
{
return streams_depot_unlink_internal(handle,
handle->conn->cwd_fsp,
smb_fname,
0);
}
static int streams_depot_rmdir(vfs_handle_struct *handle, static int streams_depot_rmdir(vfs_handle_struct *handle,
const struct smb_filename *smb_fname) const struct smb_filename *smb_fname)
{ {
@ -854,7 +865,10 @@ static int streams_depot_unlinkat(vfs_handle_struct *handle,
if (flags & AT_REMOVEDIR) { if (flags & AT_REMOVEDIR) {
ret = streams_depot_rmdir(handle, smb_fname); ret = streams_depot_rmdir(handle, smb_fname);
} else { } else {
ret = streams_depot_unlink(handle, smb_fname); ret = streams_depot_unlink_internal(handle,
dirfsp,
smb_fname,
flags);
} }
return ret; return ret;
} }