copy-acl: enhance Solaris ACL error handling

Gracefully handle EOPNOTSUPP in qcopy_acl and qset_acl.  These
functions, as used in coreutils, were causing the test suite to fail
on Solaris 8 i386 with ZFS-backed NFSv3 mounts.  The failures included
errors such as:

FAIL: cp/backup-dir
cp: preserving permissions for `y/x': Operation not supported on
transport endpoint

* lib/copy-acl.c (qcopy_acl): Also ignore EOPNOTSUPP.
* lib/set-mode-acl.c (qset_acl): Likewise.

Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca>
Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 28c48ae6a8b51418daf04f7ba9652245ebe8686c..f6d7e6449a5d78019afee19faddfc09b718e0856 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-02  Ben Walton  <bwalton@artsci.utoronto.ca>  (tiny change)
+
+       copy-acl: enhance Solaris ACL error handling
+       * lib/copy-acl.c (qcopy_acl): Also ignore EOPNOTSUPP.
+       * lib/set-mode-acl.c (qset_acl): Likewise.
+
 2010-03-02  Bruno Haible  <bruno@clisp.org>
 
        spawn: Don't override the system defined values on FreeBSD 8.

diff --git a/lib/copy-acl.c b/lib/copy-acl.c
index 1e822408e23688115a7f5a2f6a3c21ba04d757bc..c047913d42da537bfa2f3b94862e86ed17fa6f0a 100644 (file)
--- a/lib/copy-acl.c
+++ b/lib/copy-acl.c
@@ -294,7 +294,7 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
 
       if (count < 0)
         {
-          if (errno == ENOSYS || errno == ENOTSUP)
+          if (errno == ENOSYS || errno == ENOTSUP || errno == EOPNOTSUPP)
             {
               count = 0;
               entries = NULL;
@@ -358,7 +358,8 @@ qcopy_acl (const char *src_name, int source_desc, const char *dst_name,
       if (ret < 0 && saved_errno == 0)
         {
           saved_errno = errno;
-          if (errno == ENOSYS && !acl_nontrivial (count, entries))
+          if ((errno == ENOSYS || errno == EOPNOTSUPP)
+              && !acl_nontrivial (count, entries))
             saved_errno = 0;
         }
       else

diff --git a/lib/set-mode-acl.c b/lib/set-mode-acl.c
index c5b4726e23099063dc7b4a44eb19bd9eec117c5c..2cd2c75f387376f40be3fdbb907093dd91b33c65 100644 (file)
--- a/lib/set-mode-acl.c
+++ b/lib/set-mode-acl.c
@@ -387,7 +387,7 @@ qset_acl (char const *name, int desc, mode_t mode)
       ret = acl (name, SETACL, sizeof (entries) / sizeof (aclent_t), entries);
     if (ret < 0)
       {
-        if (errno == ENOSYS)
+        if (errno == ENOSYS || errno == EOPNOTSUPP)
           return chmod_or_fchmod (name, desc, mode);
         return -1;
       }