]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: VFS: vfs_recycle. Use SMB_VFS_RENAMEAT() instead of SMB_VFS_RENAME().
authorJeremy Allison <jra@samba.org>
Fri, 9 Aug 2019 23:27:49 +0000 (16:27 -0700)
committerJeremy Allison <jra@samba.org>
Fri, 16 Aug 2019 19:52:34 +0000 (19:52 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/modules/vfs_recycle.c

index e84f0351c871da88be72d8c1e5a4535daa7b99b0..93f281033f7e76874a52c31d89802d0c60476e51 100644 (file)
@@ -634,7 +634,11 @@ static int recycle_unlink(vfs_handle_struct *handle,
 
        DEBUG(10, ("recycle: Moving %s to %s\n", smb_fname_str_dbg(smb_fname),
                smb_fname_str_dbg(smb_fname_final)));
-       rc = SMB_VFS_NEXT_RENAME(handle, smb_fname, smb_fname_final);
+       rc = SMB_VFS_NEXT_RENAMEAT(handle,
+                       handle->conn->cwd_fsp,
+                       smb_fname,
+                       handle->conn->cwd_fsp,
+                       smb_fname_final);
        if (rc != 0) {
                DEBUG(3, ("recycle: Move error %d (%s), purging file %s "
                          "(%s)\n", errno, strerror(errno),