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

s3: VFS: nfs4acl_xattr. 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_nfs4acl_xattr.c b/source3/modules/vfs_nfs4acl_xattr.c
index 5c80d1b0326..b1b1eae49f8 100644
--- a/source3/modules/vfs_nfs4acl_xattr.c
+++ b/source3/modules/vfs_nfs4acl_xattr.c
@@ -262,41 +262,6 @@ static NTSTATUS nfs4acl_xattr_fget_nt_acl(struct vfs_handle_struct *handle,
 	return status;
 }
 
-static NTSTATUS nfs4acl_xattr_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 **sd)
-{
-	struct SMB4ACL_T *smb4acl = NULL;
-	TALLOC_CTX *frame = talloc_stackframe();
-	DATA_BLOB blob;
-	NTSTATUS status;
-
-	status = nfs4acl_get_blob(handle, NULL, smb_fname, frame, &blob);
-	if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
-		TALLOC_FREE(frame);
-		return nfs4acl_xattr_default_sd(
-			handle,	smb_fname, mem_ctx, sd);
-	}
-	if (!NT_STATUS_IS_OK(status)) {
-		TALLOC_FREE(frame);
-		return status;
-	}
-
-	status = nfs4acl_blob_to_smb4(handle, &blob, frame, &smb4acl);
-	if (!NT_STATUS_IS_OK(status)) {
-		TALLOC_FREE(frame);
-		return status;
-	}
-
-	status = smb_get_nt_acl_nfs4(handle->conn, smb_fname, NULL,
-				     security_info, mem_ctx, sd,
-				     smb4acl);
-	TALLOC_FREE(frame);
-	return status;
-}
-
 static NTSTATUS nfs4acl_xattr_get_nt_acl_at(struct vfs_handle_struct *handle,
 				struct files_struct *dirfsp,
 				const struct smb_filename *smb_fname,
@@ -695,7 +660,6 @@ static int nfs4acl_xattr_fail__sys_acl_blob_get_fd(vfs_handle_struct *handle, fi
 static struct vfs_fn_pointers nfs4acl_xattr_fns = {
 	.connect_fn = nfs4acl_connect,
 	.fget_nt_acl_fn = nfs4acl_xattr_fget_nt_acl,
-	.get_nt_acl_fn = nfs4acl_xattr_get_nt_acl,
 	.get_nt_acl_at_fn = nfs4acl_xattr_get_nt_acl_at,
 	.fset_nt_acl_fn = nfs4acl_xattr_fset_nt_acl,