From: Jeremy Allison <jra@samba.org>
Date: Fri, 13 Sep 2019 21:19:21 +0000 (-0700)
Subject: s3: VFS: vfs_fruit. Change fruit_pread_meta_stream() to use UNLINKAT().
X-Git-Tag: talloc-2.3.1~597
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3bd45212607aad0df244db9178153b949cd97ad;p=thirdparty%2Fsamba.git

s3: VFS: vfs_fruit. Change fruit_pread_meta_stream() to use UNLINKAT().

Use conn->cwd_fsp as current fsp.

No logic change for now.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 79382882af3..228f503a425 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -2257,7 +2257,10 @@ static ssize_t fruit_pread_meta_stream(vfs_handle_struct *handle,
 	DBG_ERR("Removing [%s] after short read [%zd]\n",
 		fsp_str_dbg(fsp), nread);
 
-	ret = SMB_VFS_NEXT_UNLINK(handle, fsp->fsp_name);
+	ret = SMB_VFS_NEXT_UNLINKAT(handle,
+			fsp->conn->cwd_fsp,
+			fsp->fsp_name,
+			0);
 	if (ret != 0) {
 		DBG_ERR("Removing [%s] failed\n", fsp_str_dbg(fsp));
 		return -1;