From: Ralph Boehme <slow@samba.org>
Date: Fri, 29 Jul 2022 12:49:56 +0000 (+0200)
Subject: smbd: use metadata_fsp() with SMB_VFS_FGET_NT_ACL()
X-Git-Tag: talloc-2.4.0~1486
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c949e4b2a42423ac3851e86e489fd0c5d46d7f1f;p=thirdparty%2Fsamba.git

smbd: use metadata_fsp() with SMB_VFS_FGET_NT_ACL()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15126
MR: https://gitlab.com/samba-team/samba/-/merge_requests/2643

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
---

diff --git a/selftest/knownfail.d/samba3.blackbox.delete_stream b/selftest/knownfail.d/samba3.blackbox.delete_stream
deleted file mode 100644
index 22c996aa63b..00000000000
--- a/selftest/knownfail.d/samba3.blackbox.delete_stream
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.blackbox.delete_stream.delete stream\(fileserver\)
diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index c5b39ed9cb6..07bfb759147 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -2579,7 +2579,7 @@ WERROR _srvsvc_NetGetFileSecurity(struct pipes_struct *p,
 		goto error_exit;
 	}
 
-	nt_status = SMB_VFS_FGET_NT_ACL(fsp,
+	nt_status = SMB_VFS_FGET_NT_ACL(metadata_fsp(fsp),
 				       (SECINFO_OWNER
 					|SECINFO_GROUP
 					|SECINFO_DACL), sd_buf, &sd_buf->sd);
diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index 9aa0a768c7a..04dfef00d95 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -1263,7 +1263,7 @@ static bool user_can_read_fsp(struct files_struct *fsp)
 		return false;
         }
 
-	status = SMB_VFS_FGET_NT_ACL(fsp,
+	status = SMB_VFS_FGET_NT_ACL(metadata_fsp(fsp),
 			(SECINFO_OWNER |
 			 SECINFO_GROUP |
 			 SECINFO_DACL),
diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c
index e3c8a1e2b67..476aead590d 100644
--- a/source3/smbd/file_access.c
+++ b/source3/smbd/file_access.c
@@ -158,7 +158,7 @@ bool directory_has_default_acl_fsp(struct files_struct *fsp)
 	unsigned int i;
 	NTSTATUS status;
 
-	status = SMB_VFS_FGET_NT_ACL(fsp,
+	status = SMB_VFS_FGET_NT_ACL(metadata_fsp(fsp),
 				SECINFO_DACL,
 				talloc_tos(),
 				&secdesc);
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 45b1abb1124..a091ce8f9ec 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -296,7 +296,7 @@ NTSTATUS smbd_check_access_rights_fsp(struct files_struct *dirfsp,
 		return status;
 	}
 
-	status = SMB_VFS_FGET_NT_ACL(fsp,
+	status = SMB_VFS_FGET_NT_ACL(metadata_fsp(fsp),
 				     (SECINFO_OWNER |
 				      SECINFO_GROUP |
 				      SECINFO_DACL),
@@ -3253,7 +3253,7 @@ static NTSTATUS smbd_calculate_maximum_allowed_access_fsp(
 		return NT_STATUS_OK;
 	}
 
-	status = SMB_VFS_FGET_NT_ACL(fsp,
+	status = SMB_VFS_FGET_NT_ACL(metadata_fsp(fsp),
 				     (SECINFO_OWNER |
 					SECINFO_GROUP |
 					SECINFO_DACL),
diff --git a/source3/smbd/pysmbd.c b/source3/smbd/pysmbd.c
index ed079b5e938..6209c6626d2 100644
--- a/source3/smbd/pysmbd.c
+++ b/source3/smbd/pysmbd.c
@@ -317,7 +317,7 @@ static NTSTATUS get_nt_acl_conn(TALLOC_CTX *mem_ctx,
 		return status;
 	}
 
-	status = SMB_VFS_FGET_NT_ACL(smb_fname->fsp,
+	status = SMB_VFS_FGET_NT_ACL(metadata_fsp(smb_fname->fsp),
 				security_info_wanted,
 				mem_ctx,
 				sd);
diff --git a/source3/torture/cmd_vfs.c b/source3/torture/cmd_vfs.c
index 896197fbd5c..8d38a7a9ee7 100644
--- a/source3/torture/cmd_vfs.c
+++ b/source3/torture/cmd_vfs.c
@@ -1624,7 +1624,7 @@ static NTSTATUS cmd_fget_nt_acl(struct vfs_state *vfs, TALLOC_CTX *mem_ctx,
 		return NT_STATUS_OK;
 	}
 
-	status = SMB_VFS_FGET_NT_ACL(vfs->files[fd],
+	status = SMB_VFS_FGET_NT_ACL(metadata_fsp(vfs->files[fd]),
 				     SECINFO_OWNER | SECINFO_GROUP | SECINFO_DACL,
 				     talloc_tos(), &sd);
 	if (!NT_STATUS_IS_OK(status)) {