From 961ac078171cd229d9eb9c06160e1fbb3239bdd7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 27 Sep 2009 14:11:54 +0200 Subject: [PATCH] Disable untested support for new flavours of ACLs on AIX. --- ChangeLog | 7 +++++++ lib/file-has-acl.c | 4 ++-- lib/set-mode-acl.c | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f713d804..12962ec04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-09-27 Bruno Haible + + Disable untested support for new flavours of ACLs on AIX. + * lib/file-has-acl.c (file_has_acl): Mark newer AIX code as work in + progress. + * lib/set-mode-acl.c (qset_acl): Likewise. + 2008-12-07 Bruno Haible Add support for new flavours of ACLs on AIX. (Untested.) diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c index 4ad57107c..5e6bfe615 100644 --- a/lib/file-has-acl.c +++ b/lib/file-has-acl.c @@ -260,7 +260,7 @@ acl_nontrivial (struct acl *a) return (acl_last (a) != a->acl_ext ? 1 : 0); } -# if HAVE_ACLX_GET /* newer AIX */ +# if HAVE_ACLX_GET && defined ACL_AIX_WIP /* newer AIX */ /* Return 1 if the given ACL is non-trivial. Return 0 if it is trivial, i.e. equivalent to a simple stat() mode. */ @@ -529,7 +529,7 @@ file_has_acl (char const *name, struct stat const *sb) Repeat. */ } -# elif HAVE_ACLX_GET /* AIX */ +# elif HAVE_ACLX_GET && defined ACL_AIX_WIP /* AIX */ acl_type_t type; char aclbuf[1024]; diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c index c3747a6ed..ddac4df0e 100644 --- a/lib/set-mode-acl.c +++ b/lib/set-mode-acl.c @@ -445,7 +445,7 @@ qset_acl (char const *name, int desc, mode_t mode) } return 0; -# elif HAVE_ACLX_GET /* AIX */ +# elif HAVE_ACLX_GET && defined ACL_AIX_WIP /* AIX */ acl_type_list_t types; size_t types_size = sizeof (types); @@ -551,6 +551,7 @@ qset_acl (char const *name, int desc, mode_t mode) } return chmod_or_fchmod (name, desc, mode); + # elif HAVE_STATACL /* older AIX */ union { struct acl a; char room[128]; } u; -- 2.11.0