summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2015-11-15 23:54:34 +0000
committerngie <ngie@FreeBSD.org>2015-11-15 23:54:34 +0000
commit252de1301513347bd4e8a2d3e69622cf1221b41d (patch)
tree4099760cd029dcb87031552770181b8ffc70e5fd /share
parent2f2934388ea5d90db8198d62ae1e5271def8c346 (diff)
downloadFreeBSD-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 'share')
-rw-r--r--share/man/man9/acl.98
1 files changed, 7 insertions, 1 deletions
diff --git a/share/man/man9/acl.9 b/share/man/man9/acl.9
index c6c7159..23cc19a 100644
--- a/share/man/man9/acl.9
+++ b/share/man/man9/acl.9
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 18, 2009
+.Dd September 4, 2015
.Dt ACL 9
.Os
.Sh NAME
@@ -203,7 +203,13 @@ The following values are valid:
.It Dv ACL_ENTRY_DIRECTORY_INHERIT
.It Dv ACL_ENTRY_NO_PROPAGATE_INHERIT
.It Dv ACL_ENTRY_INHERIT_ONLY
+.It Dv ACL_ENTRY_INHERITED
.El
+The
+.Dv ACL_ENTRY_INHERITED
+flag is set on an ACE that has been inherited from its parent.
+It may also be set programmatically, and is valid on both files
+and directories.
.El
.Sh SEE ALSO
.Xr acl 3 ,
OpenPOWER on IntegriCloud