The branch, master has been updated via bda0599087b s3: Remove last vestiges of Tru64 ACL support (missed in earlier patch). from cf0c773ca56 messaging: Fix receiving file descriptors
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit bda0599087b32a0435d3a80e1f7063a6b60d976b Author: Jeremy Allison <j...@samba.org> Date: Tue Mar 16 23:10:58 2021 -0700 s3: Remove last vestiges of Tru64 ACL support (missed in earlier patch). Added WHATSNEW.txt note. Signed-off-by: Jeremy Allison <j...@samba.org> Reviewed-by: Andrew Bartlett <abart...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Fri Mar 19 14:15:02 UTC 2021 on sn-devel-184 ----------------------------------------------------------------------- Summary of changes: WHATSNEW.txt | 2 ++ source3/lib/sysacls.c | 41 ----------------------------------------- source3/wscript | 4 ---- 3 files changed, 2 insertions(+), 45 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 7a64854b828..4154e0849f2 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -43,6 +43,8 @@ NEW FEATURES/CHANGES REMOVED FEATURES ================ +Tru64 ACL support has been removed from this release. The last +supported release of Tru64 UNIX was in 2012. smb.conf changes diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c index ad970b6299b..77bf414d731 100644 --- a/source3/lib/sysacls.c +++ b/source3/lib/sysacls.c @@ -26,10 +26,6 @@ #include "modules/vfs_posixacl.h" #endif -#if defined(HAVE_TRU64_ACLS) -#include "modules/vfs_tru64acl.h" -#endif - #if defined(HAVE_SOLARIS_UNIXWARE_ACLS) #include "modules/vfs_solarisacl.h" #endif @@ -432,43 +428,6 @@ int sys_acl_delete_def_file(vfs_handle_struct *handle, return aixacl_sys_acl_delete_def_file(handle, smb_fname); } -#elif defined(HAVE_TRU64_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 tru64acl_sys_acl_get_file(handle, smb_fname, type, - mem_ctx); -} - -SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp, - TALLOC_CTX *mem_ctx) -{ - return tru64acl_sys_acl_get_fd(handle, fsp, mem_ctx); -} - -int sys_acl_set_file(vfs_handle_struct *handle, - const struct smb_filename *smb_fname, - SMB_ACL_TYPE_T type, - SMB_ACL_T acl_d) -{ - return tru64acl_sys_acl_set_file(handle, smb_fname, type, acl_d); -} - -int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp, - SMB_ACL_T acl_d) -{ - return tru64acl_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 tru64acl_sys_acl_delete_def_file(handle, smb_fname); -} - #elif defined(HAVE_SOLARIS_UNIXWARE_ACLS) SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle, diff --git a/source3/wscript b/source3/wscript index ba02a3586b9..b57ad6b42a7 100644 --- a/source3/wscript +++ b/source3/wscript @@ -543,10 +543,6 @@ return acl_get_perm_np(permset_d, perm); Logs.info('Using solaris or UnixWare ACLs') conf.DEFINE('HAVE_SOLARIS_UNIXWARE_ACLS',1) default_static_modules.extend(['vfs_solarisacl']) - elif conf.CHECK_FUNCS_IN(['acl_get_fd'], 'pacl'): - Logs.info('Using Tru64 ACLs') - conf.DEFINE('HAVE_TRU64_ACLS',1) - default_static_modules.extend(['vfs_tru64acl']) else: conf.fatal("ACL support not found. Try installing libacl1-dev " "or libacl-devel. " -- Samba Shared Repository