From: Jeremy Allison <jra@samba.org>
Date: Tue, 14 Apr 2020 17:08:27 +0000 (-0700)
Subject: s3: VFS: catia. Remove get_nt_acl_fn().
X-Git-Tag: ldb-2.2.0~583
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c68f457e817156c0b7348286dd4e4d39d99d395c;p=thirdparty%2Fsamba.git

s3: VFS: catia. Remove get_nt_acl_fn().

No longer used.

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

diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index ffdf5629190..6b89974a7ae 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -1018,43 +1018,6 @@ catia_streaminfo(struct vfs_handle_struct *handle,
 	return NT_STATUS_OK;
 }
 
-static NTSTATUS
-catia_get_nt_acl(struct vfs_handle_struct *handle,
-		 const struct smb_filename *smb_fname,
-		 uint32_t security_info,
-		 TALLOC_CTX *mem_ctx,
-		 struct security_descriptor **ppdesc)
-{
-	char *mapped_name = NULL;
-	const char *path = smb_fname->base_name;
-	struct smb_filename *mapped_smb_fname = NULL;
-	NTSTATUS status;
-
-	status = catia_string_replace_allocate(handle->conn,
-				path, &mapped_name, vfs_translate_to_unix);
-	if (!NT_STATUS_IS_OK(status)) {
-		errno = map_errno_from_nt_status(status);
-		return status;
-	}
-	mapped_smb_fname = synthetic_smb_fname(talloc_tos(),
-					mapped_name,
-					NULL,
-					&smb_fname->st,
-					smb_fname->twrp,
-					smb_fname->flags);
-	if (mapped_smb_fname == NULL) {
-		TALLOC_FREE(mapped_name);
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	status = SMB_VFS_NEXT_GET_NT_ACL(handle, mapped_smb_fname,
-					 security_info, mem_ctx, ppdesc);
-	TALLOC_FREE(mapped_name);
-	TALLOC_FREE(mapped_smb_fname);
-
-	return status;
-}
-
 static NTSTATUS catia_get_nt_acl_at(struct vfs_handle_struct *handle,
 				    struct files_struct *dirfsp,
 				    const struct smb_filename *smb_fname,
@@ -2527,7 +2490,6 @@ static struct vfs_fn_pointers vfs_catia_fns = {
 	.read_dfs_pathat_fn = catia_read_dfs_pathat,
 
 	/* NT ACL operations. */
-	.get_nt_acl_fn = catia_get_nt_acl,
 	.get_nt_acl_at_fn = catia_get_nt_acl_at,
 	.fget_nt_acl_fn = catia_fget_nt_acl,
 	.fset_nt_acl_fn = catia_fset_nt_acl,