From: Jeremy Allison <jra@samba.org>
Date: Fri, 13 Sep 2019 20:18:28 +0000 (-0700)
Subject: s3: VFS: vfs_fruit. Add files_struct *dirfsp to fruit_unlink_internal() so we can... 
X-Git-Tag: talloc-2.3.1~607
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=762b95743c1f60249451562251b7bbc0769eeab1;p=thirdparty%2Fsamba.git

s3: VFS: vfs_fruit. Add files_struct *dirfsp to fruit_unlink_internal() so we can call UNLINKAT.

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 38aedbc01e7..41e7a34fdf9 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -1952,6 +1952,7 @@ static int fruit_unlink_rsrc(vfs_handle_struct *handle,
 }
 
 static int fruit_unlink_internal(vfs_handle_struct *handle,
+			struct files_struct *dirfsp,
 			const struct smb_filename *smb_fname)
 {
 	int rc;
@@ -2168,7 +2169,9 @@ exit_rmdir:
 static int fruit_unlink(vfs_handle_struct *handle,
 			const struct smb_filename *smb_fname)
 {
-	return fruit_unlink_internal(handle, smb_fname);
+	return fruit_unlink_internal(handle,
+				handle->conn->cwd_fsp,
+				smb_fname);
 }
 
 static int fruit_unlinkat(vfs_handle_struct *handle,
@@ -2182,7 +2185,9 @@ static int fruit_unlinkat(vfs_handle_struct *handle,
 	if (flags & AT_REMOVEDIR) {
 		ret = fruit_rmdir(handle, smb_fname);
 	} else {
-		ret = fruit_unlink_internal(handle, smb_fname);
+		ret = fruit_unlink_internal(handle,
+				dirfsp,
+				smb_fname);
 	}
 	return ret;
 }