From 8ed07fa8d2da66e76d8d85af32fb2f4212790fa3 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 8 Jun 2021 16:21:14 -0700 Subject: [PATCH] s3: lib: sysacls: Remove sys_acl_get_file(). No longer used. Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme --- source3/include/smb_acls.h | 4 ---- source3/lib/sysacls.c | 46 -------------------------------------- 2 files changed, 50 deletions(-) diff --git a/source3/include/smb_acls.h b/source3/include/smb_acls.h index 3fff1089976..f8c590e9976 100644 --- a/source3/include/smb_acls.h +++ b/source3/include/smb_acls.h @@ -58,10 +58,6 @@ int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void *qual_p); int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d, SMB_ACL_PERMSET_T permset_d); int sys_acl_free_text(char *text); int sys_acl_valid(SMB_ACL_T acl_d); -SMB_ACL_T sys_acl_get_file(struct vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - SMB_ACL_TYPE_T type, - TALLOC_CTX *mem_ctx); SMB_ACL_T sys_acl_get_fd(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_ACL_TYPE_T type, diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c index ca31fc60bfb..4223d87bee7 100644 --- a/source3/lib/sysacls.c +++ b/source3/lib/sysacls.c @@ -359,14 +359,6 @@ int sys_acl_valid(SMB_ACL_T acl_d) #if defined(HAVE_POSIX_ACLS) -SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - SMB_ACL_TYPE_T type, - TALLOC_CTX *mem_ctx) -{ - return posixacl_sys_acl_get_file(handle, smb_fname, type, mem_ctx); -} - SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp, SMB_ACL_TYPE_T type, @@ -397,14 +389,6 @@ int sys_acl_delete_def_fd(vfs_handle_struct *handle, #elif defined(HAVE_AIX_ACLS) -SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - SMB_ACL_TYPE_T type, - TALLOC_CTX *mem_ctx) -{ - return aixacl_sys_acl_get_file(handle, smb_fname, type, mem_ctx); -} - SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp, SMB_ACL_TYPE_T type, @@ -434,15 +418,6 @@ int sys_acl_delete_def_fd(vfs_handle_struct *handle, } #elif defined(HAVE_SOLARIS_UNIXWARE_ACLS) -SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - SMB_ACL_TYPE_T type, - TALLOC_CTX *mem_ctx) -{ - return solarisacl_sys_acl_get_file(handle, smb_fname, type, - mem_ctx); -} - SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp, SMB_ACL_TYPE_T type, @@ -476,14 +451,6 @@ int sys_acl_delete_def_fd(vfs_handle_struct *handle, } #elif defined(HAVE_HPUX_ACLS) -SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - SMB_ACL_TYPE_T type, - TALLOC_CTX *mem_ctx) -{ - return hpuxacl_sys_acl_get_file(handle, smb_fname, type, mem_ctx); -} - SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp, SMB_ACL_TYPE_T type, @@ -513,19 +480,6 @@ int sys_acl_delete_def_fd(vfs_handle_struct *handle, } #else /* No ACLs. */ -SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - SMB_ACL_TYPE_T type, - TALLOC_CTX *mem_ctx) -{ -#ifdef ENOTSUP - errno = ENOTSUP; -#else - errno = ENOSYS; -#endif - return NULL; -} - SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp, SMB_ACL_TYPE_T type, -- 2.47.3