From: Jeremy Allison <jra@samba.org>
Date: Tue, 8 Jun 2021 00:17:40 +0000 (-0700)
Subject: s3: smbd: open_file_ntcreate(), smbd_calculate_access_mask() -> smbd_calculate_access... 
X-Git-Tag: tevent-0.11.0~539
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5abb0409ff4de3b7184ee1f0bddeb5e9c3335e91;p=thirdparty%2Fsamba.git

s3: smbd: open_file_ntcreate(), 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/smbd/open.c b/source3/smbd/open.c
index f24e0474189..2d7bcd164af 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -3813,16 +3813,15 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 		}
 	}
 
-	status = smbd_calculate_access_mask(conn,
-					conn->cwd_fsp,
-					smb_fname,
-					false,
-					access_mask,
-					&access_mask);
+	status = smbd_calculate_access_mask_fsp(smb_fname->fsp,
+						false,
+						access_mask,
+						&access_mask);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(10, ("open_file_ntcreate: smbd_calculate_access_mask "
+		DBG_DEBUG("smbd_calculate_access_mask_fsp "
 			"on file %s returned %s\n",
-			smb_fname_str_dbg(smb_fname), nt_errstr(status)));
+			smb_fname_str_dbg(smb_fname),
+			nt_errstr(status));
 		return status;
 	}