]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: Change directory_has_default_acl() -> directory_has_default_acl_fsp().
authorJeremy Allison <jra@samba.org>
Mon, 24 May 2021 23:59:30 +0000 (16:59 -0700)
committerRalph Boehme <slow@samba.org>
Wed, 9 Jun 2021 13:14:30 +0000 (13:14 +0000)
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/smbd/open.c

index b66784b6cf7dac3fad539dd4baf229bb886ec77f..f105866d2a90c26062495d01f8b1bf35f42bfb8d 100644 (file)
@@ -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)));
                }
        }