From: Jeremy Allison <jra@samba.org>
Date: Tue, 8 Jun 2021 19:44:05 +0000 (-0700)
Subject: s3: VFS: acl_xattr: Remove acl_xattr_get_nt_acl_at().
X-Git-Tag: tevent-0.11.0~512
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd8a2cfd4e17f8dea114bd6a31cbfeff87ade87a;p=thirdparty%2Fsamba.git

s3: VFS: acl_xattr: Remove acl_xattr_get_nt_acl_at().

Comment out get_acl_blob_at() as no longer used.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index 4f092de0220..908c23ffd61 100644
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -122,6 +122,7 @@ static NTSTATUS fget_acl_blob(TALLOC_CTX *ctx,
 	return map_nt_error_from_unix(errno);
 }
 
+#if 0
 static NTSTATUS get_acl_blob_at(TALLOC_CTX *ctx,
 			vfs_handle_struct *handle,
 			struct files_struct *dirfsp,
@@ -180,6 +181,7 @@ static NTSTATUS get_acl_blob_at(TALLOC_CTX *ctx,
 	TALLOC_FREE(val);
 	return map_nt_error_from_unix(errno);
 }
+#endif
 
 /*******************************************************************
  Store a DATA_BLOB into an xattr given an fsp pointer.
@@ -347,24 +349,6 @@ static NTSTATUS acl_xattr_fget_nt_acl(vfs_handle_struct *handle,
 	return status;
 }
 
-static NTSTATUS acl_xattr_get_nt_acl_at(vfs_handle_struct *handle,
-				struct files_struct *dirfsp,
-				const struct smb_filename *smb_fname,
-				uint32_t security_info,
-				TALLOC_CTX *mem_ctx,
-				struct security_descriptor **ppdesc)
-{
-	NTSTATUS status;
-	status = get_nt_acl_common_at(get_acl_blob_at,
-				handle,
-				dirfsp,
-				smb_fname,
-				security_info,
-				mem_ctx,
-				ppdesc);
-	return status;
-}
-
 static NTSTATUS acl_xattr_fset_nt_acl(vfs_handle_struct *handle,
 				      files_struct *fsp,
 				      uint32_t security_info_sent,
@@ -382,7 +366,6 @@ static struct vfs_fn_pointers vfs_acl_xattr_fns = {
 	.unlinkat_fn = acl_xattr_unlinkat,
 	.fchmod_fn = fchmod_acl_module_common,
 	.fget_nt_acl_fn = acl_xattr_fget_nt_acl,
-	.get_nt_acl_at_fn = acl_xattr_get_nt_acl_at,
 	.fset_nt_acl_fn = acl_xattr_fset_nt_acl,
 	.sys_acl_set_fd_fn = sys_acl_set_fd_xattr
 };