summaryrefslogtreecommitdiff
path: root/lib/libc/posix1e
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2010-11-01 11:38:04 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2010-11-01 11:38:04 +0000
commit3b20909b3121cd6f4b4c1626d1c418e79b740d3a (patch)
treefa8eaa944542d4bc8016f28921f24f2d6cdace38 /lib/libc/posix1e
parent51e47385f3f9154ef738552a7bf6b1f771ac01ab (diff)
Notes
Diffstat (limited to 'lib/libc/posix1e')
-rw-r--r--lib/libc/posix1e/acl_strip.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/libc/posix1e/acl_strip.c b/lib/libc/posix1e/acl_strip.c
index 8aa850f097db..f67d0979e194 100644
--- a/lib/libc/posix1e/acl_strip.c
+++ b/lib/libc/posix1e/acl_strip.c
@@ -176,6 +176,15 @@ acl_is_trivial_np(const acl_t aclp, int *trivialp)
case ACL_BRAND_NFS4:
/*
+ * If the ACL has more than canonical six entries,
+ * it's non trivial by definition.
+ */
+ if (aclp->ats_acl.acl_cnt > 6) {
+ *trivialp = 0;
+ return (0);
+ }
+
+ /*
* Calculate trivial ACL - using acl_strip_np - and compare
* with the original.
*/