Mercurial > hg > octave-jordi > gnulib-hg
changeset 17996:148bf471f772
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.
author | Andreas Gruenbacher <andreas.gruenbacher@gmail.com> |
---|---|
date | Fri, 29 May 2015 19:47:40 +0200 |
parents | 301a9d4b8f5a |
children | f7535e681d93 |
files | ChangeLog lib/set-permissions.c |
diffstat | 2 files changed, 14 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2015-05-29 Andreas Gruenbacher <andreas.gruenbacher@gmail.com> + + 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. + 2015-05-29 Pádraig Brady <P@draigBrady.com> linkat: avoid OS X 10.10 trailing slash with symlink bug
--- a/lib/set-permissions.c +++ b/lib/set-permissions.c @@ -611,13 +611,13 @@ 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 @@ 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