From: Noel Power <noel.power@suse.com>
Date: Fri, 9 Apr 2021 13:58:20 +0000 (+0200)
Subject: s3/modules: VFS: fruit: Remove fruit_chmod
X-Git-Tag: tevent-0.11.0~1204
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3df8106edc8d67a596fbc5c8679014492e12e04c;p=thirdparty%2Fsamba.git

s3/modules: VFS: fruit: Remove fruit_chmod

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 044a9680027..bba7597d8ad 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -2102,50 +2102,6 @@ static int fruit_unlink_rsrc(vfs_handle_struct *handle,
 	return rc;
 }
 
-static int fruit_chmod(vfs_handle_struct *handle,
-		       const struct smb_filename *smb_fname,
-		       mode_t mode)
-{
-	int rc = -1;
-	struct fruit_config_data *config = NULL;
-	struct smb_filename *smb_fname_adp = NULL;
-
-	rc = SMB_VFS_NEXT_CHMOD(handle, smb_fname, mode);
-	if (rc != 0) {
-		return rc;
-	}
-
-	SMB_VFS_HANDLE_GET_DATA(handle, config,
-				struct fruit_config_data, return -1);
-
-	if (config->rsrc != FRUIT_RSRC_ADFILE) {
-		return 0;
-	}
-
-	if (!VALID_STAT(smb_fname->st)) {
-		return 0;
-	}
-
-	if (!S_ISREG(smb_fname->st.st_ex_mode)) {
-		return 0;
-	}
-
-	rc = adouble_path(talloc_tos(), smb_fname, &smb_fname_adp);
-	if (rc != 0) {
-		return -1;
-	}
-
-	DEBUG(10, ("fruit_chmod: %s\n", smb_fname_adp->base_name));
-
-	rc = SMB_VFS_NEXT_CHMOD(handle, smb_fname_adp, mode);
-	if (errno == ENOENT) {
-		rc = 0;
-	}
-
-	TALLOC_FREE(smb_fname_adp);
-	return rc;
-}
-
 static int fruit_fchmod(vfs_handle_struct *handle,
                       struct files_struct *fsp,
                       mode_t mode)
@@ -5238,7 +5194,6 @@ static struct vfs_fn_pointers vfs_fruit_fns = {
 	.disk_free_fn = fruit_disk_free,
 
 	/* File operations */
-	.chmod_fn = fruit_chmod,
 	.fchmod_fn = fruit_fchmod,
 	.unlinkat_fn = fruit_unlinkat,
 	.renameat_fn = fruit_renameat,