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

s3: VFS: shadow_copy2. 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_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index 18eb0704d67..6fdf1bcfb86 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -2093,51 +2093,6 @@ done:
 	return ret;
 }
 
-static NTSTATUS shadow_copy2_get_nt_acl(vfs_handle_struct *handle,
-					const struct smb_filename *smb_fname,
-					uint32_t security_info,
-					TALLOC_CTX *mem_ctx,
-					struct security_descriptor **ppdesc)
-{
-	time_t timestamp = 0;
-	char *stripped = NULL;
-	NTSTATUS status;
-	char *conv;
-	struct smb_filename *conv_smb_fname = NULL;
-
-	if (!shadow_copy2_strip_snapshot(talloc_tos(),
-					handle,
-					smb_fname,
-					&timestamp,
-					&stripped)) {
-		return map_nt_error_from_unix(errno);
-	}
-	if (timestamp == 0) {
-		return SMB_VFS_NEXT_GET_NT_ACL(handle, smb_fname, security_info,
-					       mem_ctx, ppdesc);
-	}
-	conv = shadow_copy2_convert(talloc_tos(), handle, stripped, timestamp);
-	TALLOC_FREE(stripped);
-	if (conv == NULL) {
-		return map_nt_error_from_unix(errno);
-	}
-	conv_smb_fname = synthetic_smb_fname(talloc_tos(),
-					conv,
-					NULL,
-					NULL,
-					0,
-					smb_fname->flags);
-	if (conv_smb_fname == NULL) {
-		TALLOC_FREE(conv);
-		return NT_STATUS_NO_MEMORY;
-	}
-	status = SMB_VFS_NEXT_GET_NT_ACL(handle, conv_smb_fname, security_info,
-					 mem_ctx, ppdesc);
-	TALLOC_FREE(conv);
-	TALLOC_FREE(conv_smb_fname);
-	return status;
-}
-
 static NTSTATUS shadow_copy2_get_nt_acl_at(vfs_handle_struct *handle,
 					struct files_struct *dirfsp,
 					const struct smb_filename *smb_fname,
@@ -3213,7 +3168,6 @@ static struct vfs_fn_pointers vfs_shadow_copy2_fns = {
 	.readlinkat_fn = shadow_copy2_readlinkat,
 	.mknodat_fn = shadow_copy2_mknodat,
 	.realpath_fn = shadow_copy2_realpath,
-	.get_nt_acl_fn = shadow_copy2_get_nt_acl,
 	.get_nt_acl_at_fn = shadow_copy2_get_nt_acl_at,
 	.get_shadow_copy_data_fn = shadow_copy2_get_shadow_copy_data,
 	.mkdirat_fn = shadow_copy2_mkdirat,