summaryrefslogtreecommitdiff
path: root/lib/set-permissions.c
diff options
context:
space:
mode:
authorAndreas Gruenbacher <andreas.gruenbacher@gmail.com>2015-05-29 19:47:40 +0200
committerAndreas Gruenbacher <andreas.gruenbacher@gmail.com>2015-05-29 19:57:56 +0200
commit188c4b491b1a93c70df0acd6b123695b7b308768 (patch)
tree7a28ef6821dab475e19a5e2d647ebe657cb4cf97 /lib/set-permissions.c
parentc79f3527498974c328404ed6807f9aaa5608832e (diff)
downloadgnulib-188c4b491b1a93c70df0acd6b123695b7b308768.tar.gz
acl-permissions: Fix build on Solaris and Cygwin
Reported by Tom G. Christensen <tgc@jupiterrise.com>: * lib/set-permissions.c (set_acls): The count, entries, ace_count, and ace_entries variables have moved into struct permission_context but they were still accessed as local variables here.
Diffstat (limited to 'lib/set-permissions.c')
-rw-r--r--lib/set-permissions.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/set-permissions.c b/lib/set-permissions.c
index 47cb91ca16..db3696c560 100644
--- a/lib/set-permissions.c
+++ b/lib/set-permissions.c
@@ -611,13 +611,13 @@ set_acls (struct permission_context *ctx, const char *name, int desc,
if (ret == 0 && ctx->count)
{
if (desc != -1)
- ret = facl (desc, SETACL, count, entries);
+ ret = facl (desc, SETACL, ctx->count, ctx->entries);
else
- ret = acl (name, SETACL, count, entries);
+ ret = acl (name, SETACL, ctx->count, ctx->entries);
if (ret < 0)
{
if ((errno == ENOSYS || errno == EOPNOTSUPP || errno == EINVAL)
- && acl_nontrivial (count, entries) == 0)
+ && acl_nontrivial (ctx->count, ctx->entries) == 0)
ret = 0;
}
else
@@ -628,13 +628,13 @@ set_acls (struct permission_context *ctx, const char *name, int desc,
if (ret == 0 && ctx->ace_count)
{
if (desc != -1)
- ret = facl (desc, ACE_SETACL, ace_count, ace_entries);
+ ret = facl (desc, ACE_SETACL, ctx->ace_count, ctx->ace_entries);
else
- ret = acl (name, ACE_SETACL, ace_count, ace_entries);
+ ret = acl (name, ACE_SETACL, ctx->ace_count, ctx->ace_entries);
if (ret < 0)
{
if ((errno == ENOSYS || errno == EINVAL || errno == ENOTSUP)
- && acl_ace_nontrivial (ace_count, ace_entries) == 0)
+ && acl_ace_nontrivial (ctx->ace_count, ctx->ace_entries) == 0)
ret = 0;
}
else