s3: Remove last vestiges of Tru64 ACL support (missed in earlier patch).

Added WHATSNEW.txt note.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Mar 19 14:15:02 UTC 2021 on sn-devel-184

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 7a64854b828e3996e6b9c2c1343214ede268c37d..4154e0849f20e5394254eaa110137170031b5bdc 100644 (file)
--- 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 ad970b6299be1eb1152554c94b03511ceb2479cc..77bf414d7317ce90d8a0a0ad6d583ed850c22f1a 100644 (file)
--- 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 ba02a3586b9e34d515bb5e381ef601618a96dbd4..b57ad6b42a7f5c8e01a1738a8a36f9389ac92892 100644 (file)
--- 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.  "