From: Jeremy Allison <jra@samba.org>
Date: Fri, 13 Sep 2019 21:08:08 +0000 (-0700)
Subject: s3: VFS: vfs_fruit. Add files_struct *dirfsp parameter to fruit_unlink_rsrc().
X-Git-Tag: talloc-2.3.1~600
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e79ff5dcfe8455ab956f58c31cfffeede50d9bd3;p=thirdparty%2Fsamba.git

s3: VFS: vfs_fruit. Add files_struct *dirfsp parameter to fruit_unlink_rsrc().

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 4b78e391f25..2a9e8ab495a 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -1928,8 +1928,9 @@ static int fruit_unlink_rsrc_xattr(vfs_handle_struct *handle,
 }
 
 static int fruit_unlink_rsrc(vfs_handle_struct *handle,
-			     const struct smb_filename *smb_fname,
-			     bool force_unlink)
+			struct files_struct *dirfsp,
+			const struct smb_filename *smb_fname,
+			bool force_unlink)
 {
 	struct fruit_config_data *config = NULL;
 	int rc;
@@ -1974,7 +1975,10 @@ static int fruit_unlink_internal(vfs_handle_struct *handle,
 				dirfsp,
 				smb_fname);
 	} else if (is_afpresource_stream(smb_fname->stream_name)) {
-		return fruit_unlink_rsrc(handle, smb_fname, false);
+		return fruit_unlink_rsrc(handle,
+				dirfsp,
+				smb_fname,
+				false);
 	} else if (is_ntfs_stream_smb_fname(smb_fname)) {
 		return SMB_VFS_NEXT_UNLINKAT(handle,
 				dirfsp,
@@ -2002,7 +2006,7 @@ static int fruit_unlink_internal(vfs_handle_struct *handle,
 		return -1;
 	}
 
-	rc = fruit_unlink_rsrc(handle, rsrc_smb_fname, true);
+	rc = fruit_unlink_rsrc(handle, dirfsp, rsrc_smb_fname, true);
 	if ((rc != 0) && (errno != ENOENT)) {
 		DBG_ERR("Forced unlink of [%s] failed [%s]\n",
 			smb_fname_str_dbg(rsrc_smb_fname), strerror(errno));