acl: Fix a test failure on newer Solaris 10 with ZFS.

* tests/test-sameacls.c (main): Interpret acl GETACLCNT failure with
ENOSYS as no ACL.
Reported by Jim Meyering.

diff --git a/ChangeLog b/ChangeLog
index 5d5a478..176aff9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-09-06  Bruno Haible  <bruno@clisp.org>
 
+       acl: Fix a test failure on newer Solaris 10 with ZFS.
+       * tests/test-sameacls.c (main): Interpret acl GETACLCNT failure with
+       ENOSYS as no ACL.
+       Reported by Jim Meyering.
+
+2011-09-06  Bruno Haible  <bruno@clisp.org>
+
        acl: Update for AIX >= 5.3 with NFS.
        * lib/file-has-acl.c (file_has_acl): Interpret aclx_get failure with
        ENOSYS as no ACL.

diff --git a/tests/test-sameacls.c b/tests/test-sameacls.c
index 848af20..421f841 100644 (file)
--- a/tests/test-sameacls.c
+++ b/tests/test-sameacls.c
@@ -227,7 +227,11 @@ main (int argc, char *argv[])
   int count2;
 
   count1 = acl (file1, GETACLCNT, 0, NULL);
+  if (count1 < 0 && errno == ENOSYS) /* Can happen on Solaris 10 with ZFS */
+    count1 = 0;
   count2 = acl (file2, GETACLCNT, 0, NULL);
+  if (count2 < 0 && errno == ENOSYS) /* Can happen on Solaris 10 with ZFS */
+    count2 = 0;
 
   if (count1 < 0)
     {
@@ -253,13 +257,13 @@ main (int argc, char *argv[])
       aclent_t *entries2 = XNMALLOC (count2, aclent_t);
       int i;
 
-      if (acl (file1, GETACL, count1, entries1) < count1)
+      if (count1 > 0 && acl (file1, GETACL, count1, entries1) < count1)
         {
           fprintf (stderr, "error retrieving the ACLs of file %s\n", file1);
           fflush (stderr);
           abort ();
         }
-      if (acl (file2, GETACL, count2, entries2) < count1)
+      if (count2 > 0 && acl (file2, GETACL, count2, entries2) < count1)
         {
           fprintf (stderr, "error retrieving the ACLs of file %s\n", file2);
           fflush (stderr);