summaryrefslogtreecommitdiff
path: root/test_utils
diff options
context:
space:
mode:
authorMartin Matuska <martin@matuska.org>2017-03-02 04:27:39 +0100
committerMartin Matuska <martin@matuska.org>2017-03-02 04:34:31 +0100
commit784851b7b476f3cb2e1247c0f8913b8726c103d9 (patch)
tree3de2ffbeb2fe518fc0b1c951cdad031bcb117f32 /test_utils
parentd9036ca49e414c6b5560c48126b6963204a6eda9 (diff)
downloadlibarchive-784851b7b476f3cb2e1247c0f8913b8726c103d9.tar.gz
Change Solaris ACL support to use acl() and facl()
This removes dependency on libsec and enables compilation on Solaris 10.
Diffstat (limited to 'test_utils')
-rw-r--r--test_utils/test_common.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/test_utils/test_common.h b/test_utils/test_common.h
index 88ef04c3..6cb26ae6 100644
--- a/test_utils/test_common.h
+++ b/test_utils/test_common.h
@@ -138,13 +138,18 @@
* If this platform has <sys/acl.h>, acl_get(), facl_get(), acl_set(),
* facl_set() and types aclent_t and ace_t it uses Solaris-style ACL functions
*/
-#if HAVE_SYS_ACL_H && HAVE_ACL_GET && HAVE_FACL_GET && HAVE_ACL_SET && HAVE_FACL_SET && HAVE_ACLENT_T && HAVE_ACE_T
-#define HAVE_SUN_ACL 1
+#if HAVE_SYS_ACL_H && HAVE_ACL && HAVE_FACL && HAVE_ACLENT_T && \
+ HAVE_DECL_GETACL && HAVE_DECL_GETACLCNT && HAVE_DECL_SETACL
+#define HAVE_SUN_ACL 1
+#if HAVE_ACE_T && HAVE_DECL_ACE_GETACL && HAVE_DECL_ACE_GETACLCNT && \
+ HAVE_DECL_ACE_SETACL
+#define HAVE_SUN_NFS4_ACL 1
+#endif
#endif
/* Define if platform supports NFSv4 ACLs */
-#if (HAVE_POSIX_ACL && HAVE_ACL_TYPE_NFS4) || HAVE_SUN_ACL || HAVE_DARWIN_ACL
-#define HAVE_NFS4_ACL 1
+#if (HAVE_POSIX_ACL && HAVE_ACL_TYPE_NFS4) || HAVE_SUN_NFS4_ACL || HAVE_DARWIN_ACL
+#define HAVE_NFS4_ACL 1
#endif
/*