sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

s3:vfs_default: implement VFS_RENAME_HOW_NO_REPLACE in vfswrap_renameat()

Browse Source 
We can use renameat2() without ifdef as libreplace always provides it.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15693

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Stefan Metzmacher 2024-08-07 13:14:23 +02:00
parent adc8dea944
commit fe8b4617dd
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source3/modules/vfs_default.c
View File

@ -1291,22 +1291,28 @@ static int vfswrap_renameat(vfs_handle_struct *handle,
const struct vfs_rename_how *how)
{
int result = -1;
int flags = 0;
START_PROFILE(syscall_renameat);
SMB_ASSERT(!is_named_stream(smb_fname_src));
SMB_ASSERT(!is_named_stream(smb_fname_dst));
if (how->flags != 0) {
if (how->flags & ~VFS_RENAME_HOW_NO_REPLACE) {
END_PROFILE(syscall_renameat);
errno = EINVAL;
return -1;
}
result = renameat(fsp_get_pathref_fd(srcfsp),
smb_fname_src->base_name,
fsp_get_pathref_fd(dstfsp),
smb_fname_dst->base_name);
if (how->flags & VFS_RENAME_HOW_NO_REPLACE) {
flags |= RENAME_NOREPLACE;
}
result = renameat2(fsp_get_pathref_fd(srcfsp),
smb_fname_src->base_name,
fsp_get_pathref_fd(dstfsp),
smb_fname_dst->base_name,
flags);
END_PROFILE(syscall_renameat);
return result;