sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

s3: VFS: vfs_recycle: Wrap recycle_unlink() into a call to recycle_unlink_internal().

Browse Source 
Allows UNLINKAT parameters to be passed.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Jeremy Allison 2019-09-16 17:22:58 -07:00 committed by Ralph Boehme
parent 8d9ff50f85
commit 1f8bdb3974
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source3/modules/vfs_recycle.c
View File

@ -452,8 +452,10 @@ static void recycle_do_touch(vfs_handle_struct *handle,
/**
* Check if file should be recycled
**/
static int recycle_unlink(vfs_handle_struct *handle,
const struct smb_filename *smb_fname)
static int recycle_unlink_internal(vfs_handle_struct *handle,
struct files_struct *dirfsp,
const struct smb_filename *smb_fname,
int flags)
{
connection_struct *conn = handle->conn;
char *path_name = NULL;
@ -670,6 +672,15 @@ done:
return rc;
}
static int recycle_unlink(vfs_handle_struct *handle,
const struct smb_filename *smb_fname)
{
return recycle_unlink_internal(handle,
handle->conn->cwd_fsp,
smb_fname,
0);
}
static int recycle_unlinkat(vfs_handle_struct *handle,
struct files_struct *dirfsp,
const struct smb_filename *smb_fname,
@ -684,8 +695,10 @@ static int recycle_unlinkat(vfs_handle_struct *handle,
flags);
} else {
SMB_ASSERT(dirfsp == dirfsp->conn->cwd_fsp);
ret = recycle_unlink(handle,
smb_fname);
ret = recycle_unlink_internal(handle,
dirfsp,
smb_fname,
flags);
}
return ret;
}