From: Jeremy Allison <jra@samba.org>
Date: Mon, 24 May 2021 23:59:30 +0000 (-0700)
Subject: s3: smbd: Change directory_has_default_acl() -> directory_has_default_acl_fsp().
X-Git-Tag: tevent-0.11.0~600
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=428bceb127cac9261c3b22636dfd3d4a6fff5336;p=thirdparty%2Fsamba.git

s3: smbd: Change directory_has_default_acl() -> directory_has_default_acl_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 b66784b6cf7..f105866d2a9 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -3813,9 +3813,7 @@ static NTSTATUS open_file_ntcreate(connection_struct *conn,
 	 */
 
         if ((flags2 & O_CREAT) && lp_inherit_acls(SNUM(conn)) &&
-	    (def_acl = directory_has_default_acl(conn,
-				conn->cwd_fsp,
-				parent_dir_fname)))
+	    (def_acl = directory_has_default_acl_fsp(parent_dir_fname->fsp)))
 	{
 		unx_mode = (0777 & lp_create_mask(SNUM(conn)));
 	}
@@ -4301,9 +4299,7 @@ static NTSTATUS mkdir_internal(connection_struct *conn,
 	}
 
 	if (lp_inherit_acls(SNUM(conn))) {
-		if (directory_has_default_acl(conn,
-					      conn->cwd_fsp,
-					      parent_dir_fname)) {
+		if (directory_has_default_acl_fsp(parent_dir_fname->fsp)) {
 			mode = (0777 & lp_directory_mask(SNUM(conn)));
 		}
 	}