From: Jeremy Allison <jra@samba.org>
Date: Sat, 15 May 2021 01:14:55 +0000 (-0700)
Subject: s3: VFS: cap: Remove cap_sys_acl_delete_def_file().
X-Git-Tag: tevent-0.11.0~840
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=109dfac02b3411bf88b5b709055caab0f5788b40;p=thirdparty%2Fsamba.git

s3: VFS: cap: Remove cap_sys_acl_delete_def_file().

No longer used.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <noel.power@suse.com>
---

diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index 0c12712a8f1..181d11c28ac 100644
--- a/source3/modules/vfs_cap.c
+++ b/source3/modules/vfs_cap.c
@@ -758,41 +758,6 @@ static SMB_ACL_T cap_sys_acl_get_file(vfs_handle_struct *handle,
 	return ret;
 }
 
-static int cap_sys_acl_delete_def_file(vfs_handle_struct *handle,
-			const struct smb_filename *smb_fname)
-{
-	struct smb_filename *cap_smb_fname = NULL;
-	char *cappath = capencode(talloc_tos(), smb_fname->base_name);
-	int ret;
-	int saved_errno = 0;
-
-	if (!cappath) {
-		errno = ENOMEM;
-		return -1;
-	}
-	cap_smb_fname = synthetic_smb_fname(talloc_tos(),
-					cappath,
-					NULL,
-					NULL,
-					smb_fname->twrp,
-					smb_fname->flags);
-	if (cap_smb_fname == NULL) {
-		TALLOC_FREE(cappath);
-		errno = ENOMEM;
-		return -1;
-	}
-	ret = SMB_VFS_NEXT_SYS_ACL_DELETE_DEF_FILE(handle, cap_smb_fname);
-	if (ret == -1) {
-		saved_errno = errno;
-	}
-	TALLOC_FREE(cappath);
-	TALLOC_FREE(cap_smb_fname);
-	if (saved_errno) {
-		errno = saved_errno;
-	}
-	return ret;
-}
-
 static ssize_t cap_getxattr(vfs_handle_struct *handle,
 			const struct smb_filename *smb_fname,
 			const char *name,
@@ -961,7 +926,6 @@ static struct vfs_fn_pointers vfs_cap_fns = {
 	.mknodat_fn = cap_mknodat,
 	.realpath_fn = cap_realpath,
 	.sys_acl_get_file_fn = cap_sys_acl_get_file,
-	.sys_acl_delete_def_file_fn = cap_sys_acl_delete_def_file,
 	.getxattr_fn = cap_getxattr,
 	.getxattrat_send_fn = vfs_not_implemented_getxattrat_send,
 	.getxattrat_recv_fn = vfs_not_implemented_getxattrat_recv,