summaryrefslogtreecommitdiffstats
path: root/bin
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 /bin
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 'bin')
-rw-r--r--bin/setfacl/setfacl.16
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/setfacl/setfacl.1 b/bin/setfacl/setfacl.1
index 4104315..cfb0f01 100644
--- a/bin/setfacl/setfacl.1
+++ b/bin/setfacl/setfacl.1
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 1, 2013
+.Dd September 4, 2015
.Dt SETFACL 1
.Os
.Sh NAME
@@ -378,9 +378,11 @@ dir_inherit
inherit_only
.It n
no_propagate
+.It I
+inherited
.El
.Pp
-Inheritance flags may be only set on directories.
+Other than the "inherited" flag, inheritance flags may be only set on directories.
.It Ar "ACL type"
The ACL type field is either
.Dq Li allow
OpenPOWER on IntegriCloud