bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#20681: [PATCH] acl-permissions: Fix build on Mac OS X and older AIX


From: Andreas Gruenbacher
Subject: bug#20681: [PATCH] acl-permissions: Fix build on Mac OS X and older AIX (Bug#20681)
Date: Fri, 29 May 2015 21:06:08 +0200

* lib/set-permissions.c (set_acls): Fix more errors introduced in the acl
module rewrite.
---
 ChangeLog             |  4 ++++
 lib/set-permissions.c | 13 +++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fb8b446..a44510a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2015-05-29  Andreas Gruenbacher  <address@hidden>
 
+       acl-permissions: Fix build on Mac OS X and older AIX (Bug#20681)
+       * lib/set-permissions.c (set_acls): Fix more errors introduced in the 
acl
+       module rewrite.
+
        acl-permissions: Fix build on Solaris and Cygwin
        Reported by Tom G. Christensen <address@hidden>:
        * lib/set-permissions.c (set_acls): The count, entries, ace_count, and
diff --git a/lib/set-permissions.c b/lib/set-permissions.c
index db3696c..ba291f3 100644
--- a/lib/set-permissions.c
+++ b/lib/set-permissions.c
@@ -566,7 +566,7 @@ set_acls (struct permission_context *ctx, const char *name, 
int desc,
        {
          acl_free (acl);
 
-         acl = acl_init (acl);
+         acl = acl_init (0);
          if (acl)
            {
              if (HAVE_ACL_SET_FD && desc != -1)
@@ -582,12 +582,13 @@ set_acls (struct permission_context *ctx, const char 
*name, int desc,
   else
     {
       if (HAVE_ACL_SET_FD && desc != -1)
-       ret = acl_set_fd (desc, acl);
+       ret = acl_set_fd (desc, ctx->acl);
       else
-       ret = acl_set_file (name, ACL_TYPE_EXTENDED, acl);
+       ret = acl_set_file (name, ACL_TYPE_EXTENDED, ctx->acl);
       if (ret != 0)
        {
-         if (! acl_errno_valid (saved_errno) && ! acl_extended_nontrivial 
(acl))
+         if (! acl_errno_valid (errno)
+             && ! acl_extended_nontrivial (ctx->acl))
            ret = 0;
        }
     }
@@ -696,9 +697,9 @@ set_acls (struct permission_context *ctx, const char *name, 
int desc,
   if (ret == 0 && ctx->have_u)
     {
       if (desc != -1)
-       ret = fchacl (desc, &u.a, u.a.acl_len);
+       ret = fchacl (desc, &ctx->u.a, ctx->u.a.acl_len);
       else
-       ret = chacl (name, &u.a, u.a.acl_len);
+       ret = chacl (name, &ctx->u.a, ctx->u.a.acl_len);
       if (ret < 0)
        {
          if (errno == ENOSYS && from_mode)
-- 
2.4.0






reply via email to

[Prev in Thread] Current Thread [Next in Thread]