From: Jeremy Allison Date: Sat, 15 May 2021 01:17:20 +0000 (-0700) Subject: s3: VFS: fake_acls: Remove fake_acls_sys_acl_delete_def_file(). X-Git-Tag: tevent-0.11.0~837 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=331d772cc7173233fc664500450646bbc3681bca;p=thirdparty%2Fsamba.git s3: VFS: fake_acls: Remove fake_acls_sys_acl_delete_def_file(). No longer used. Signed-off-by: Jeremy Allison Reviewed-by: Noel Power --- diff --git a/source3/modules/vfs_fake_acls.c b/source3/modules/vfs_fake_acls.c index f2675825d07..41695686086 100644 --- a/source3/modules/vfs_fake_acls.c +++ b/source3/modules/vfs_fake_acls.c @@ -354,26 +354,6 @@ static int fake_acls_sys_acl_set_fd(vfs_handle_struct *handle, return ret; } -static int fake_acls_sys_acl_delete_def_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname) -{ - int ret; - const char *name = FAKE_ACL_DEFAULT_XATTR; - - if (!S_ISDIR(smb_fname->st.st_ex_mode)) { - errno = EINVAL; - return -1; - } - - ret = SMB_VFS_NEXT_FREMOVEXATTR(handle, smb_fname->fsp, name); - if (ret == -1 && errno == ENOATTR) { - ret = 0; - errno = 0; - } - - return ret; -} - static int fake_acls_sys_acl_delete_def_fd(vfs_handle_struct *handle, struct files_struct *fsp) { @@ -652,7 +632,6 @@ static struct vfs_fn_pointers vfs_fake_acls_fns = { .sys_acl_blob_get_file_fn = posix_sys_acl_blob_get_file, .sys_acl_blob_get_fd_fn = posix_sys_acl_blob_get_fd, .sys_acl_set_fd_fn = fake_acls_sys_acl_set_fd, - .sys_acl_delete_def_file_fn = fake_acls_sys_acl_delete_def_file, .sys_acl_delete_def_fd_fn = fake_acls_sys_acl_delete_def_fd, .lchown_fn = fake_acls_lchown, .fchown_fn = fake_acls_fchown,