Disable untested support for new flavours of ACLs on AIX.

diff --git a/ChangeLog b/ChangeLog
index 7f713d804f9dd6a803e151ec33fdf7d9cb50bd7f..12962ec042dadf675991dd1df266c3396436647b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-27  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        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 4ad57107c6de65424179c2e4252c3260800d2a4d..5e6bfe615473c3d8a5cfe95a1b35c4bd93fc0873 100644 (file)
--- 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 c3747a6ed781a62d80c15bbbec96104c5efd7a41..ddac4df0e2b573ae14ce6fed30d53288fb967eb2 100644 (file)
--- 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;