changeset 12077:72b0c1288a50

Disable untested support for new flavours of ACLs on AIX.
author Bruno Haible <bruno@clisp.org>
date Sun, 27 Sep 2009 14:11:54 +0200
parents bd0ab8b4fe70
children 3710e1c3943e
files ChangeLog lib/file-has-acl.c lib/set-mode-acl.c
diffstat 3 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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.)
--- a/lib/file-has-acl.c
+++ b/lib/file-has-acl.c
@@ -260,7 +260,7 @@
   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 @@
 	     Repeat.  */
 	}
 
-# elif HAVE_ACLX_GET /* AIX */
+# elif HAVE_ACLX_GET && defined ACL_AIX_WIP /* AIX */
 
       acl_type_t type;
       char aclbuf[1024];
--- a/lib/set-mode-acl.c
+++ b/lib/set-mode-acl.c
@@ -445,7 +445,7 @@
     }
   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 @@
     }
 
   return chmod_or_fchmod (name, desc, mode);
+
 # elif HAVE_STATACL /* older AIX */
 
   union { struct acl a; char room[128]; } u;