acl: Fix compilation on Solaris 10 (older version).

* lib/file-has-acl.c (acl_ace_nontrivial): Use NEW_ACE_EVERYONE instead
of ACE_EVERYONE.
* lib/set-mode-acl.c (qset_acl): Likewise.
Reported by Christian Jullien <eligis@orange.fr>.

diff --git a/ChangeLog b/ChangeLog
index 304e696..f50c4a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-11  Bruno Haible  <bruno@clisp.org>
+
+       acl: Fix compilation on Solaris 10 (older version).
+       * lib/file-has-acl.c (acl_ace_nontrivial): Use NEW_ACE_EVERYONE instead
+       of ACE_EVERYONE.
+       * lib/set-mode-acl.c (qset_acl): Likewise.
+       Reported by Christian Jullien <eligis@orange.fr>.
+
 2011-09-10  Bruno Haible  <bruno@clisp.org>
 
        iconv, unsetenv: Add support for MSVC compiler.

diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c
index ddae4fe..1b7e392 100644 (file)
--- a/lib/file-has-acl.c
+++ b/lib/file-has-acl.c
@@ -217,7 +217,7 @@ acl_ace_nontrivial (int count, ace_t *entries)
             index2 = 0;
           else if (ace->a_flags == (NEW_ACE_GROUP | NEW_ACE_IDENTIFIER_GROUP))
             index2 = 2;
-          else if (ace->a_flags == ACE_EVERYONE)
+          else if (ace->a_flags == NEW_ACE_EVERYONE)
             index2 = 4;
           else
             return 1;

diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c
index 3954c29..d0fc6f8 100644 (file)
--- a/lib/set-mode-acl.c
+++ b/lib/set-mode-acl.c
@@ -328,14 +328,14 @@ qset_acl (char const *name, int desc, mode_t mode)
           else
             entries[2].a_access_mask |= NEW_ACE_EXECUTE;
           entries[4].a_type = NEW_ACE_ACCESS_DENIED_ACE_TYPE;
-          entries[4].a_flags = ACE_EVERYONE;
+          entries[4].a_flags = NEW_ACE_EVERYONE;
           entries[4].a_who = 0;
           entries[4].a_access_mask = NEW_ACE_WRITE_NAMED_ATTRS
                                      | NEW_ACE_WRITE_ATTRIBUTES
                                      | NEW_ACE_WRITE_ACL
                                      | NEW_ACE_WRITE_OWNER;
           entries[5].a_type = NEW_ACE_ACCESS_ALLOWED_ACE_TYPE;
-          entries[5].a_flags = ACE_EVERYONE;
+          entries[5].a_flags = NEW_ACE_EVERYONE;
           entries[5].a_who = 0;
           entries[5].a_access_mask = NEW_ACE_READ_NAMED_ATTRS
                                      | NEW_ACE_READ_ATTRIBUTES