From: Jeremy Allison <jra@samba.org>
Date: Tue, 25 May 2021 01:39:52 +0000 (-0700)
Subject: s3: smbd: Inside inherit_new_acl(), change from SMB_VFS_GET_NT_ACL_AT() -> SMB_VFS_FG... 
X-Git-Tag: tevent-0.11.0~597
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3bd2cfc2920b5a3b4dab202b3fb3db59ad6fe258;p=thirdparty%2Fsamba.git

s3: smbd: Inside inherit_new_acl(), change from SMB_VFS_GET_NT_ACL_AT() -> SMB_VFS_FGET_NT_ACL().

One more pathname-based call gone.

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 7b9d23a3ad3..77be5f8084a 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -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);