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

s3: VFS: vfs_fruit. Add struct files_struct *dirfsp parameter to fruit_unlink_rsrc_adouble() and convert to 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 9edfdffff84..79382882af3 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -1873,8 +1873,9 @@ static int fruit_unlink_rsrc_stream(vfs_handle_struct *handle,
 }
 
 static int fruit_unlink_rsrc_adouble(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)
 {
 	int rc;
 	struct adouble *ad = NULL;
@@ -1909,7 +1910,10 @@ static int fruit_unlink_rsrc_adouble(vfs_handle_struct *handle,
 		return -1;
 	}
 
-	rc = SMB_VFS_NEXT_UNLINK(handle, adp_smb_fname);
+	rc = SMB_VFS_NEXT_UNLINKAT(handle,
+			dirfsp,
+			adp_smb_fname,
+			0);
 	TALLOC_FREE(adp_smb_fname);
 	if ((rc != 0) && (errno == ENOENT) && force_unlink) {
 		rc = 0;
@@ -1951,7 +1955,10 @@ static int fruit_unlink_rsrc(vfs_handle_struct *handle,
 		break;
 
 	case FRUIT_RSRC_ADFILE:
-		rc = fruit_unlink_rsrc_adouble(handle, smb_fname, force_unlink);
+		rc = fruit_unlink_rsrc_adouble(handle,
+				dirfsp,
+				smb_fname,
+				force_unlink);
 		break;
 
 	case FRUIT_RSRC_XATTR: