From 0680a383019748a30f4a88f5d3a618964a3daa00 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 14 May 2021 21:39:00 -0700 Subject: [PATCH] s3: smbd: Remove all references to utility and backend functions supporting sys_acl_delete_def_file(). No longer used. Signed-off-by: Jeremy Allison Reviewed-by: Noel Power --- docs-xml/Samba-Developers-Guide/vfs.xml | 1 - docs-xml/manpages/vfs_full_audit.8.xml | 1 - source3/include/smb_acls.h | 2 -- source3/lib/sysacls.c | 36 --------------------------------- source3/modules/vfs_posixacl.c | 6 ------ source3/modules/vfs_posixacl.h | 3 --- 6 files changed, 49 deletions(-) diff --git a/docs-xml/Samba-Developers-Guide/vfs.xml b/docs-xml/Samba-Developers-Guide/vfs.xml index 948b98936a2..268295a20ea 100644 --- a/docs-xml/Samba-Developers-Guide/vfs.xml +++ b/docs-xml/Samba-Developers-Guide/vfs.xml @@ -647,7 +647,6 @@ struct vfs_ops example_ops = { NULL, /* sys_acl_valid */ NULL, /* sys_acl_set_file */ NULL, /* sys_acl_set_fd */ - NULL, /* sys_acl_delete_def_file */ NULL, /* sys_acl_get_perm */ NULL, /* sys_acl_free_text */ NULL, /* sys_acl_free_acl */ diff --git a/docs-xml/manpages/vfs_full_audit.8.xml b/docs-xml/manpages/vfs_full_audit.8.xml index 1b768917d21..10c96fd20e3 100644 --- a/docs-xml/manpages/vfs_full_audit.8.xml +++ b/docs-xml/manpages/vfs_full_audit.8.xml @@ -141,7 +141,6 @@ symlinkat sys_acl_blob_get_fd sys_acl_blob_get_file - sys_acl_delete_def_file sys_acl_get_fd sys_acl_get_file sys_acl_set_fd diff --git a/source3/include/smb_acls.h b/source3/include/smb_acls.h index 1e9e99ad1ff..3e679e58f1f 100644 --- a/source3/include/smb_acls.h +++ b/source3/include/smb_acls.h @@ -70,8 +70,6 @@ int sys_acl_set_file(struct vfs_handle_struct *handle, SMB_ACL_T acl_d); int sys_acl_set_fd(struct vfs_handle_struct *handle, struct files_struct *fsp, SMB_ACL_T acl_d); -int sys_acl_delete_def_file(struct vfs_handle_struct *handle, - const struct smb_filename *smb_fname); int sys_acl_delete_def_fd(struct vfs_handle_struct *handle, struct files_struct *fsp); int no_acl_syscall_error(int err); diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c index 297e2684ada..e41f88b1285 100644 --- a/source3/lib/sysacls.c +++ b/source3/lib/sysacls.c @@ -353,7 +353,6 @@ int sys_acl_valid(SMB_ACL_T acl_d) /* * acl_get_file, acl_get_fd, acl_set_file, acl_set_fd and - * sys_acl_delete_def_file, * sys_acl_delete_def_fd are to be redirected to the default * statically-bound acl vfs module, but they are replacable. */ @@ -387,12 +386,6 @@ int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp, return posixacl_sys_acl_set_fd(handle, fsp, SMB_ACL_TYPE_ACCESS, acl_d); } -int sys_acl_delete_def_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname) -{ - return posixacl_sys_acl_delete_def_file(handle, smb_fname); -} - int sys_acl_delete_def_fd(vfs_handle_struct *handle, files_struct *fsp) { @@ -429,12 +422,6 @@ int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp, return aixacl_sys_acl_set_fd(handle, fsp, acl_d); } -int sys_acl_delete_def_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname) -{ - return aixacl_sys_acl_delete_def_file(handle, smb_fname); -} - int sys_acl_delete_def_fd(vfs_handle_struct *handle, files_struct *fsp) { @@ -472,12 +459,6 @@ int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp, return solarisacl_sys_acl_set_fd(handle, fsp, acl_d); } -int sys_acl_delete_def_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname) -{ - return solarisacl_sys_acl_delete_def_file(handle, smb_fname); -} - int sys_acl_delete_def_fd(vfs_handle_struct *handle, files_struct *fsp) { @@ -513,12 +494,6 @@ int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp, return hpuxacl_sys_acl_set_fd(handle, fsp, acl_d); } -int sys_acl_delete_def_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname) -{ - return hpuxacl_sys_acl_delete_def_file(handle, smb_fname); -} - int sys_acl_delete_def_fd(vfs_handle_struct *handle, files_struct *fsp) { @@ -574,17 +549,6 @@ int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp, return -1; } -int sys_acl_delete_def_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname) -{ -#ifdef ENOTSUP - errno = ENOTSUP; -#else - errno = ENOSYS; -#endif - return -1; -} - int sys_acl_delete_def_fd(vfs_handle_struct *handle, files_struct *fsp) { diff --git a/source3/modules/vfs_posixacl.c b/source3/modules/vfs_posixacl.c index f393b036d31..365759f6346 100644 --- a/source3/modules/vfs_posixacl.c +++ b/source3/modules/vfs_posixacl.c @@ -172,12 +172,6 @@ int posixacl_sys_acl_set_fd(vfs_handle_struct *handle, return res; } -int posixacl_sys_acl_delete_def_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname) -{ - return acl_delete_def_file(smb_fname->base_name); -} - int posixacl_sys_acl_delete_def_fd(vfs_handle_struct *handle, files_struct *fsp) { diff --git a/source3/modules/vfs_posixacl.h b/source3/modules/vfs_posixacl.h index eb473986c52..7c7007b5f57 100644 --- a/source3/modules/vfs_posixacl.h +++ b/source3/modules/vfs_posixacl.h @@ -40,9 +40,6 @@ int posixacl_sys_acl_set_fd(vfs_handle_struct *handle, SMB_ACL_TYPE_T type, SMB_ACL_T theacl); -int posixacl_sys_acl_delete_def_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname); - int posixacl_sys_acl_delete_def_fd(vfs_handle_struct *handle, files_struct *fsp); -- 2.11.4.GIT