diff options
author | trasz <trasz@FreeBSD.org> | 2010-01-30 14:54:12 +0000 |
---|---|---|
committer | trasz <trasz@FreeBSD.org> | 2010-01-30 14:54:12 +0000 |
commit | e13d4632062c36e5eeffc16c5eb2408c0304e05d (patch) | |
tree | aab608ad78aea42da26fa36c09b924ecb5e6a6df | |
parent | 025436b3716ea53d58b3a5424988573eb7050177 (diff) | |
download | FreeBSD-src-e13d4632062c36e5eeffc16c5eb2408c0304e05d.zip FreeBSD-src-e13d4632062c36e5eeffc16c5eb2408c0304e05d.tar.gz |
MFC r196839:
Add NFSv4 ACL support to find(1).
-rw-r--r-- | usr.bin/find/function.c | 60 |
1 files changed, 35 insertions, 25 deletions
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c index bfa0a36..c11d24f 100644 --- a/usr.bin/find/function.c +++ b/usr.bin/find/function.c @@ -371,38 +371,48 @@ c_mXXdepth(OPTION *option, char ***argvp) int f_acl(PLAN *plan __unused, FTSENT *entry) { - int match, entries; - acl_entry_t ae; acl_t facl; + acl_type_t acl_type; + int acl_supported = 0, ret, trivial; if (S_ISLNK(entry->fts_statp->st_mode)) return 0; - if ((match = pathconf(entry->fts_accpath, _PC_ACL_EXTENDED)) <= 0) { - if (match < 0 && errno != EINVAL) - warn("%s", entry->fts_accpath); - else - return 0; + ret = pathconf(entry->fts_accpath, _PC_ACL_NFS4); + if (ret > 0) { + acl_supported = 1; + acl_type = ACL_TYPE_NFS4; + } else if (ret < 0 && errno != EINVAL) { + warn("%s", entry->fts_accpath); + return (0); } - match = 0; - if ((facl = acl_get_file(entry->fts_accpath,ACL_TYPE_ACCESS)) != NULL) { - if (acl_get_entry(facl, ACL_FIRST_ENTRY, &ae) == 1) { - /* - * POSIX.1e requires that ACLs of type ACL_TYPE_ACCESS - * must have at least three entries (owner, group, - * other). - */ - entries = 1; - while (acl_get_entry(facl, ACL_NEXT_ENTRY, &ae) == 1) { - if (++entries > 3) { - match = 1; - break; - } - } + if (acl_supported == 0) { + ret = pathconf(entry->fts_accpath, _PC_ACL_EXTENDED); + if (ret > 0) { + acl_supported = 1; + acl_type = ACL_TYPE_ACCESS; + } else if (ret < 0 && errno != EINVAL) { + warn("%s", entry->fts_accpath); + return (0); } - acl_free(facl); - } else + } + if (acl_supported == 0) + return (0); + + facl = acl_get_file(entry->fts_accpath, acl_type); + if (facl == NULL) { warn("%s", entry->fts_accpath); - return match; + return (0); + } + ret = acl_is_trivial_np(facl, &trivial); + acl_free(facl); + if (ret) { + warn("%s", entry->fts_accpath); + acl_free(facl); + return (0); + } + if (trivial) + return (0); + return (1); } PLAN * |