diff options
| author | ngie <ngie@FreeBSD.org> | 2015-11-15 23:54:34 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-11-15 23:54:34 +0000 |
| commit | 252de1301513347bd4e8a2d3e69622cf1221b41d (patch) | |
| tree | 4099760cd029dcb87031552770181b8ffc70e5fd /sys/cddl/compat | |
| parent | 2f2934388ea5d90db8198d62ae1e5271def8c346 (diff) | |
| download | FreeBSD-src-252de1301513347bd4e8a2d3e69622cf1221b41d.zip FreeBSD-src-252de1301513347bd4e8a2d3e69622cf1221b41d.tar.gz | |
MFC r289195:
Integrate the tests from lib/libarchive, usr.bin/cpio, and usr.bin/tar in to
the FreeBSD test suite
functional_test.sh was ported from bin/sh/tests/functional_test.sh, as a
small wrapper around libarchive_test, bsdcpio_test, and bsdtar_test provided
by upstream.
A handful of testcases in lib/libarchive/tests have been disabled as they
were failing when run with kyua test (see BROKEN_TESTS in
lib/libarchive/tests/Makefile)
As a sidenote: this removes the check/test targets from the Makefiles as they
don't match the pattern used in the rest of the FreeBSD test suite.
Sponsored by: EMC / Isilon Storage Division
Conflicts:
lib/libarchive/test
usr.bin/cpio/test
Diffstat (limited to 'sys/cddl/compat')
| -rw-r--r-- | sys/cddl/compat/opensolaris/kern/opensolaris_acl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c b/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c index c10b101..0bbad36 100644 --- a/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c +++ b/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c @@ -64,6 +64,8 @@ struct zfs2bsd flags[] = {{ACE_FILE_INHERIT_ACE, ACL_ENTRY_NO_PROPAGATE_INHERIT}, {ACE_INHERIT_ONLY_ACE, ACL_ENTRY_INHERIT_ONLY}, + {ACE_INHERITED_ACE, + ACL_ENTRY_INHERITED}, {ACE_SUCCESSFUL_ACCESS_ACE_FLAG, ACL_ENTRY_SUCCESSFUL_ACCESS}, {ACE_FAILED_ACCESS_ACE_FLAG, |
