From: Jeremy Allison <jra@samba.org>
Date: Fri, 13 Sep 2019 20:20:36 +0000 (-0700)
Subject: s3: VFS: vfs_fruit. Change fruit_unlink_internal() to call UNLNKAT.
X-Git-Tag: talloc-2.3.1~606
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=41a740f25120872e67240440f1f8c2f0c8763bbb;p=thirdparty%2Fsamba.git

s3: VFS: vfs_fruit. Change fruit_unlink_internal() to call UNLNKAT.

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 41e7a34fdf9..e7d3c63c7a5 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -1967,9 +1967,15 @@ static int fruit_unlink_internal(vfs_handle_struct *handle,
 	} else if (is_afpresource_stream(smb_fname->stream_name)) {
 		return fruit_unlink_rsrc(handle, smb_fname, false);
 	} else if (is_ntfs_stream_smb_fname(smb_fname)) {
-		return SMB_VFS_NEXT_UNLINK(handle, smb_fname);
+		return SMB_VFS_NEXT_UNLINKAT(handle,
+				dirfsp,
+				smb_fname,
+				0);
 	} else if (is_adouble_file(smb_fname->base_name)) {
-		return SMB_VFS_NEXT_UNLINK(handle, smb_fname);
+		return SMB_VFS_NEXT_UNLINKAT(handle,
+				dirfsp,
+				smb_fname,
+				0);
 	}
 
 	/*
@@ -1996,7 +2002,10 @@ static int fruit_unlink_internal(vfs_handle_struct *handle,
 	}
 	TALLOC_FREE(rsrc_smb_fname);
 
-	return SMB_VFS_NEXT_UNLINK(handle, smb_fname);
+	return SMB_VFS_NEXT_UNLINKAT(handle,
+			dirfsp,
+			smb_fname,
+			0);
 }
 
 static int fruit_chmod(vfs_handle_struct *handle,