diff options
Diffstat (limited to 'lib/acl-internal.c')
| -rw-r--r-- | lib/acl-internal.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/acl-internal.c b/lib/acl-internal.c index c62adb0d9d5..92e7b9bdf58 100644 --- a/lib/acl-internal.c +++ b/lib/acl-internal.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include "acl-internal.h" | 24 | #include "acl-internal.h" |
| 25 | 25 | ||
| 26 | #if USE_ACL && HAVE_ACL_GET_FILE | 26 | #if USE_ACL && HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */ |
| 27 | 27 | ||
| 28 | # if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */ | 28 | # if HAVE_ACL_TYPE_EXTENDED /* Mac OS X */ |
| 29 | 29 | ||
| @@ -37,7 +37,7 @@ acl_extended_nontrivial (acl_t acl) | |||
| 37 | return (acl_entries (acl) > 0); | 37 | return (acl_entries (acl) > 0); |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | # else /* Linux, FreeBSD, IRIX, Tru64 */ | 40 | # else /* Linux, FreeBSD, IRIX, Tru64, Cygwin >= 2.5 */ |
| 41 | 41 | ||
| 42 | /* ACL is an ACL, from a file, stored as type ACL_TYPE_ACCESS. | 42 | /* ACL is an ACL, from a file, stored as type ACL_TYPE_ACCESS. |
| 43 | Return 1 if the given ACL is non-trivial. | 43 | Return 1 if the given ACL is non-trivial. |
| @@ -51,7 +51,7 @@ acl_access_nontrivial (acl_t acl) | |||
| 51 | at least, allowing us to write | 51 | at least, allowing us to write |
| 52 | return (3 < acl_entries (acl)); | 52 | return (3 < acl_entries (acl)); |
| 53 | but the following code is more robust. */ | 53 | but the following code is more robust. */ |
| 54 | # if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD */ | 54 | # if HAVE_ACL_FIRST_ENTRY /* Linux, FreeBSD, Cygwin >= 2.5 */ |
| 55 | 55 | ||
| 56 | acl_entry_t ace; | 56 | acl_entry_t ace; |
| 57 | int got_one; | 57 | int got_one; |
| @@ -124,7 +124,7 @@ acl_default_nontrivial (acl_t acl) | |||
| 124 | 124 | ||
| 125 | # endif | 125 | # endif |
| 126 | 126 | ||
| 127 | #elif USE_ACL && HAVE_FACL && defined GETACL /* Solaris, Cygwin, not HP-UX */ | 127 | #elif USE_ACL && HAVE_FACL && defined GETACL /* Solaris, Cygwin < 2.5, not HP-UX */ |
| 128 | 128 | ||
| 129 | /* Test an ACL retrieved with GETACL. | 129 | /* Test an ACL retrieved with GETACL. |
| 130 | Return 1 if the given ACL, consisting of COUNT entries, is non-trivial. | 130 | Return 1 if the given ACL, consisting of COUNT entries, is non-trivial. |
| @@ -479,7 +479,7 @@ void | |||
| 479 | free_permission_context (struct permission_context *ctx) | 479 | free_permission_context (struct permission_context *ctx) |
| 480 | { | 480 | { |
| 481 | #if USE_ACL | 481 | #if USE_ACL |
| 482 | # if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */ | 482 | # if HAVE_ACL_GET_FILE /* Linux, FreeBSD, Mac OS X, IRIX, Tru64, Cygwin >= 2.5 */ |
| 483 | if (ctx->acl) | 483 | if (ctx->acl) |
| 484 | acl_free (ctx->acl); | 484 | acl_free (ctx->acl); |
| 485 | # if !HAVE_ACL_TYPE_EXTENDED | 485 | # if !HAVE_ACL_TYPE_EXTENDED |
| @@ -487,7 +487,7 @@ free_permission_context (struct permission_context *ctx) | |||
| 487 | acl_free (ctx->default_acl); | 487 | acl_free (ctx->default_acl); |
| 488 | # endif | 488 | # endif |
| 489 | 489 | ||
| 490 | # elif defined GETACL /* Solaris, Cygwin */ | 490 | # elif defined GETACL /* Solaris, Cygwin < 2.5 */ |
| 491 | free (ctx->entries); | 491 | free (ctx->entries); |
| 492 | # ifdef ACE_GETACL | 492 | # ifdef ACE_GETACL |
| 493 | free (ctx->ace_entries); | 493 | free (ctx->ace_entries); |