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

s3: VFS: acl_tdb. Remove acl_tdb_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_tdb.c b/source3/modules/vfs_acl_tdb.c
index dab215571b2..3818b15e3f9 100644
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -154,6 +154,7 @@ static NTSTATUS fget_acl_blob(TALLOC_CTX *ctx,
 	return NT_STATUS_OK;
 }
 
+#if 0
 /*******************************************************************
  Pull a security descriptor into a DATA_BLOB from a tdb store.
 *******************************************************************/
@@ -209,6 +210,7 @@ static NTSTATUS get_acl_blob_at(TALLOC_CTX *ctx,
 	}
 	return NT_STATUS_OK;
 }
+#endif
 
 /*******************************************************************
  Store a DATA_BLOB into a tdb record given an fsp pointer.
@@ -413,25 +415,6 @@ static NTSTATUS acl_tdb_fget_nt_acl(vfs_handle_struct *handle,
 	return status;
 }
 
-static NTSTATUS acl_tdb_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_tdb_fset_nt_acl(vfs_handle_struct *handle,
 				    files_struct *fsp,
 				    uint32_t security_info_sent,
@@ -450,7 +433,6 @@ static struct vfs_fn_pointers vfs_acl_tdb_fns = {
 	.unlinkat_fn = unlinkat_acl_tdb,
 	.fchmod_fn = fchmod_acl_module_common,
 	.fget_nt_acl_fn = acl_tdb_fget_nt_acl,
-	.get_nt_acl_at_fn = acl_tdb_get_nt_acl_at,
 	.fset_nt_acl_fn = acl_tdb_fset_nt_acl,
 	.sys_acl_set_fd_fn = sys_acl_set_fd_tdb
 };