]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3: smbd: Inside inherit_new_acl(), change from SMB_VFS_GET_NT_ACL_AT() -> SMB_VFS_FG...
authorJeremy Allison <jra@samba.org>
Tue, 25 May 2021 01:39:52 +0000 (18:39 -0700)
committerRalph Boehme <slow@samba.org>
Wed, 9 Jun 2021 13:14:30 +0000 (13:14 +0000)
One more pathname-based call gone.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/smbd/open.c

index 7b9d23a3ad3d4b50a307b8ab0ec588459525e2ec..77be5f8084a4ee8d0e7821f3f973d34294134197 100644 (file)
@@ -5064,22 +5064,9 @@ static NTSTATUS inherit_new_acl(struct smb_filename *parent_dir_fname,
        const struct dom_sid *SY_U_sid = NULL;
        const struct dom_sid *SY_G_sid = NULL;
        size_t size = 0;
-       struct smb_filename *parent_dir = NULL;
        bool ok;
 
-       status = SMB_VFS_PARENT_PATHNAME(fsp->conn,
-                                        frame,
-                                        fsp->fsp_name,
-                                        &parent_dir,
-                                        NULL);
-       if (!NT_STATUS_IS_OK(status)) {
-               TALLOC_FREE(frame);
-               return status;
-       }
-
-       status = SMB_VFS_GET_NT_ACL_AT(fsp->conn,
-                               fsp->conn->cwd_fsp,
-                               parent_dir,
+       status = SMB_VFS_FGET_NT_ACL(parent_dir_fname->fsp,
                                (SECINFO_OWNER | SECINFO_GROUP | SECINFO_DACL),
                                frame,
                                &parent_desc);