From: Jeremy Allison <jra@samba.org>
Date: Tue, 8 Jun 2021 00:13:50 +0000 (-0700)
Subject: s3: VFS: fruit: fruit_freaddir_attr(), smbd_calculate_access_mask() -> smbd_calculate... 
X-Git-Tag: tevent-0.11.0~540
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3293cc8d75bb7793a7999bed343fa643cfbbcc42;p=thirdparty%2Fsamba.git

s3: VFS: fruit: fruit_freaddir_attr(), smbd_calculate_access_mask() -> smbd_calculate_access_mask_fsp().

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 3855e961e18..7fdd5f3fafa 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -4269,10 +4269,7 @@ static NTSTATUS fruit_freaddir_attr(struct vfs_handle_struct *handle,
 	if (!config->readdir_attr_max_access) {
 		attr_data->attr_data.aapl.max_access = FILE_GENERIC_ALL;
 	} else {
-		status = smbd_calculate_access_mask(
-			handle->conn,
-			handle->conn->cwd_fsp,
-			fsp->fsp_name,
+		status = smbd_calculate_access_mask_fsp(fsp,
 			false,
 			SEC_FLAG_MAXIMUM_ALLOWED,
 			&attr_data->attr_data.aapl.max_access);