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

s3: VFS: media_harmony. 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_media_harmony.c b/source3/modules/vfs_media_harmony.c
index 423bb7ea7a4..325a5446295 100644
--- a/source3/modules/vfs_media_harmony.c
+++ b/source3/modules/vfs_media_harmony.c
@@ -1888,63 +1888,6 @@ out:
  * doesn't do anything.
  */
 
-/*
- * Success: return NT_STATUS_OK
- * Failure: return NT status error
- * In this case, "name" is a path.
- */
-static NTSTATUS mh_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)
-{
-	NTSTATUS status;
-	char *clientPath;
-	struct smb_filename *client_smb_fname = NULL;
-	TALLOC_CTX *ctx;
-
-	DEBUG(MH_INFO_DEBUG, ("Entering mh_get_nt_acl\n"));
-	if (!is_in_media_files(smb_fname->base_name))
-	{
-		status = SMB_VFS_NEXT_GET_NT_ACL(handle, smb_fname,
-						 security_info,
-						 mem_ctx, ppdesc);
-		goto out;
-	}
-
-	clientPath = NULL;
-	ctx = talloc_tos();
-
-	if (alloc_get_client_path(handle, ctx,
-				smb_fname->base_name,
-				&clientPath))
-	{
-		status = map_nt_error_from_unix(errno);
-		goto err;
-	}
-
-	client_smb_fname = synthetic_smb_fname(talloc_tos(),
-					clientPath,
-					NULL,
-					NULL,
-					smb_fname->twrp,
-					smb_fname->flags);
-	if (client_smb_fname == NULL) {
-		TALLOC_FREE(clientPath);
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	status = SMB_VFS_NEXT_GET_NT_ACL(handle, client_smb_fname,
-					 security_info,
-					 mem_ctx, ppdesc);
-err:
-	TALLOC_FREE(clientPath);
-	TALLOC_FREE(client_smb_fname);
-out:
-	return status;
-}
-
 /*
  * Success: return NT_STATUS_OK
  * Failure: return NT status error
@@ -2293,7 +2236,6 @@ static struct vfs_fn_pointers vfs_mh_fns = {
 
 	/* NT ACL operations. */
 
-	.get_nt_acl_fn = mh_get_nt_acl,
 	.get_nt_acl_at_fn = mh_get_nt_acl_at,
 
 	/* POSIX ACL operations. */