aboutsummaryrefslogtreecommitdiff
path: root/lib/libc/posix1e
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libc/posix1e')
-rw-r--r--lib/libc/posix1e/Makefile.inc13
-rw-r--r--lib/libc/posix1e/Symbol.map3
-rw-r--r--lib/libc/posix1e/acl.37
-rw-r--r--lib/libc/posix1e/acl_branding.c1
-rw-r--r--lib/libc/posix1e/acl_calc_mask.c1
-rw-r--r--lib/libc/posix1e/acl_cmp_np.31
-rw-r--r--lib/libc/posix1e/acl_cmp_np.c1
-rw-r--r--lib/libc/posix1e/acl_compat.c1
-rw-r--r--lib/libc/posix1e/acl_copy.c1
-rw-r--r--lib/libc/posix1e/acl_delete.c1
-rw-r--r--lib/libc/posix1e/acl_delete_entry.c1
-rw-r--r--lib/libc/posix1e/acl_entry.c1
-rw-r--r--lib/libc/posix1e/acl_equiv_mode_np.c4
-rw-r--r--lib/libc/posix1e/acl_extended_file_np.31
-rw-r--r--lib/libc/posix1e/acl_extended_file_np.c1
-rw-r--r--lib/libc/posix1e/acl_flag.c1
-rw-r--r--lib/libc/posix1e/acl_free.c1
-rw-r--r--lib/libc/posix1e/acl_from_mode_np.c1
-rw-r--r--lib/libc/posix1e/acl_from_text.c1
-rw-r--r--lib/libc/posix1e/acl_from_text_nfs4.c1
-rw-r--r--lib/libc/posix1e/acl_get.312
-rw-r--r--lib/libc/posix1e/acl_get.c1
-rw-r--r--lib/libc/posix1e/acl_get_entry.36
-rw-r--r--lib/libc/posix1e/acl_id_to_name.c1
-rw-r--r--lib/libc/posix1e/acl_init.c1
-rw-r--r--lib/libc/posix1e/acl_perm.c1
-rw-r--r--lib/libc/posix1e/acl_set.c1
-rw-r--r--lib/libc/posix1e/acl_strip.c1
-rw-r--r--lib/libc/posix1e/acl_support.c1
-rw-r--r--lib/libc/posix1e/acl_support_nfs4.c1
-rw-r--r--lib/libc/posix1e/acl_to_text.c3
-rw-r--r--lib/libc/posix1e/acl_to_text_nfs4.c4
-rw-r--r--lib/libc/posix1e/acl_valid.c1
-rw-r--r--lib/libc/posix1e/extattr.c1
-rw-r--r--lib/libc/posix1e/mac.c1
-rw-r--r--lib/libc/posix1e/mac_exec.c1
-rw-r--r--lib/libc/posix1e/mac_free.38
-rw-r--r--lib/libc/posix1e/mac_get.38
-rw-r--r--lib/libc/posix1e/mac_get.c1
-rw-r--r--lib/libc/posix1e/mac_prepare.38
-rw-r--r--lib/libc/posix1e/mac_set.c1
-rw-r--r--lib/libc/posix1e/mac_text.38
-rw-r--r--lib/libc/posix1e/posix1e.34
43 files changed, 28 insertions, 90 deletions
diff --git a/lib/libc/posix1e/Makefile.inc b/lib/libc/posix1e/Makefile.inc
index 5d3d30ed6dea..934998cdd092 100644
--- a/lib/libc/posix1e/Makefile.inc
+++ b/lib/libc/posix1e/Makefile.inc
@@ -1,4 +1,3 @@
-
.PATH: ${LIBC_SRCTOP}/posix1e
CFLAGS+=-D_ACL_PRIVATE
@@ -95,23 +94,27 @@ MAN+= acl.3 \
posix1e.3
MLINKS+=acl_create_entry.3 acl_create_entry_np.3\
+ acl_cmp_np.3 acl_cmp.3 \
acl_delete.3 acl_delete_def_file.3 \
- acl_delete.3 acl_delete_file_np.3 \
+ acl_delete.3 acl_delete_def_link_np.3 \
acl_delete.3 acl_delete_fd_np.3 \
+ acl_delete.3 acl_delete_file_np.3 \
+ acl_delete.3 acl_delete_link_np.3 \
acl_delete_entry.3 acl_delete_entry_np.3\
acl_extended_file_np.3 acl_extended_file_nofollow_np.3 \
acl_extended_file_np.3 acl_extended_link_np.3 \
- acl_get.3 acl_get_file.3 \
acl_get.3 acl_get_fd.3 \
acl_get.3 acl_get_fd_np.3 \
+ acl_get.3 acl_get_file.3 \
acl_get.3 acl_get_link_np.3 \
- acl_set.3 acl_set_file.3 \
acl_set.3 acl_set_fd.3 \
acl_set.3 acl_set_fd_np.3 \
+ acl_set.3 acl_set_file.3 \
acl_set.3 acl_set_link_np.3 \
acl_to_text.3 acl_to_text_np.3 \
- acl_valid.3 acl_valid_file_np.3 \
acl_valid.3 acl_valid_fd_np.3 \
+ acl_valid.3 acl_valid_file_np.3 \
+ acl_valid.3 acl_valid_link_np.3 \
extattr.3 extattr_namespace_to_string.3 \
extattr.3 extattr_string_to_namespace.3 \
mac_get.3 mac_get_fd.3 \
diff --git a/lib/libc/posix1e/Symbol.map b/lib/libc/posix1e/Symbol.map
index 87e18493d1ec..92a0bf85cfa2 100644
--- a/lib/libc/posix1e/Symbol.map
+++ b/lib/libc/posix1e/Symbol.map
@@ -1,6 +1,3 @@
-/*
- */
-
FBSD_1.0 {
acl_calc_mask;
acl_copy_entry;
diff --git a/lib/libc/posix1e/acl.3 b/lib/libc/posix1e/acl.3
index c74b92028c6d..4c5f232a2e6a 100644
--- a/lib/libc/posix1e/acl.3
+++ b/lib/libc/posix1e/acl.3
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd May 8, 2023
+.Dd September 21, 2023
.Dt ACL 3
.Os
.Sh NAME
@@ -286,11 +286,6 @@ POSIX.2c describes a set of userland utilities for manipulating these
labels.
.Pp
POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft continues on the cross-platform POSIX.1e
-implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page for more information.
.Sh HISTORY
POSIX.1e support was introduced in
.Fx 4.0 ;
diff --git a/lib/libc/posix1e/acl_branding.c b/lib/libc/posix1e/acl_branding.c
index 4cb9feb1d281..85c0d2b86825 100644
--- a/lib/libc/posix1e/acl_branding.c
+++ b/lib/libc/posix1e/acl_branding.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <assert.h>
#include <errno.h>
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_calc_mask.c b/lib/libc/posix1e/acl_calc_mask.c
index 74a432839c17..3e5c5afd06c2 100644
--- a/lib/libc/posix1e/acl_calc_mask.c
+++ b/lib/libc/posix1e/acl_calc_mask.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_cmp_np.3 b/lib/libc/posix1e/acl_cmp_np.3
index a8dca4959d2e..5e47df833d0d 100644
--- a/lib/libc/posix1e/acl_cmp_np.3
+++ b/lib/libc/posix1e/acl_cmp_np.3
@@ -63,6 +63,7 @@ to the corresponding value:
.Bl -tag -width Er
.It Bq Er EINVAL
Either first or second argument does not point to a valid ACL.
+.El
.Sh SEE ALSO
.Xr acl 3 ,
.Xr posix1e 3
diff --git a/lib/libc/posix1e/acl_cmp_np.c b/lib/libc/posix1e/acl_cmp_np.c
index f1ec108629a5..f7ee9c235a04 100644
--- a/lib/libc/posix1e/acl_cmp_np.c
+++ b/lib/libc/posix1e/acl_cmp_np.c
@@ -29,7 +29,6 @@
* acl_cmp_np: Compare two ACL's.
*/
-#include <sys/cdefs.h>
#include <sys/acl.h>
#include <sys/errno.h>
diff --git a/lib/libc/posix1e/acl_compat.c b/lib/libc/posix1e/acl_compat.c
index f8eb55116d84..836cf3cab500 100644
--- a/lib/libc/posix1e/acl_compat.c
+++ b/lib/libc/posix1e/acl_compat.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/acl.h>
int __oldacl_get_perm_np(acl_permset_t, oldacl_perm_t);
diff --git a/lib/libc/posix1e/acl_copy.c b/lib/libc/posix1e/acl_copy.c
index 96a5ed479641..3f0771b1c257 100644
--- a/lib/libc/posix1e/acl_copy.c
+++ b/lib/libc/posix1e/acl_copy.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_delete.c b/lib/libc/posix1e/acl_delete.c
index b0fb59391ec5..35303fe87e0f 100644
--- a/lib/libc/posix1e/acl_delete.c
+++ b/lib/libc/posix1e/acl_delete.c
@@ -31,7 +31,6 @@
* acl_delete_def_file -- remove a default acl from a file
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_delete_entry.c b/lib/libc/posix1e/acl_delete_entry.c
index 5faa52065fe9..a787609f3853 100644
--- a/lib/libc/posix1e/acl_delete_entry.c
+++ b/lib/libc/posix1e/acl_delete_entry.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_entry.c b/lib/libc/posix1e/acl_entry.c
index eb9103439efe..abba3a0586dc 100644
--- a/lib/libc/posix1e/acl_entry.c
+++ b/lib/libc/posix1e/acl_entry.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_equiv_mode_np.c b/lib/libc/posix1e/acl_equiv_mode_np.c
index 06bd3a3deda3..333b010541ee 100644
--- a/lib/libc/posix1e/acl_equiv_mode_np.c
+++ b/lib/libc/posix1e/acl_equiv_mode_np.c
@@ -29,7 +29,6 @@
* acl_equiv_mode_np: Check if an ACL can be represented as a mode_t.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/errno.h>
@@ -50,7 +49,7 @@ acl_equiv_mode_np(acl_t acl, mode_t *mode_p)
/* Linux returns 0 for ACL returned by acl_init() */
if (_acl_brand(acl) == ACL_BRAND_UNKNOWN && acl->ats_acl.acl_cnt == 0)
- return (0);
+ goto done;
// TODO: Do we want to handle ACL_BRAND_NFS4 in this function? */
if (_acl_brand(acl) != ACL_BRAND_POSIX)
@@ -92,6 +91,7 @@ acl_equiv_mode_np(acl_t acl, mode_t *mode_p)
}
}
+done:
if (mode_p != NULL)
*mode_p = ret_mode;
diff --git a/lib/libc/posix1e/acl_extended_file_np.3 b/lib/libc/posix1e/acl_extended_file_np.3
index 26572be9d2b3..4673e9c3e417 100644
--- a/lib/libc/posix1e/acl_extended_file_np.3
+++ b/lib/libc/posix1e/acl_extended_file_np.3
@@ -75,6 +75,7 @@ to the corresponding value:
.Bl -tag -width Er
.It Bq Er EACCES
Search permission is denied for a component of the path prefix.
+.El
.Sh SEE ALSO
.Xr extattr_get_file 2 ,
.Xr posix1e 3
diff --git a/lib/libc/posix1e/acl_extended_file_np.c b/lib/libc/posix1e/acl_extended_file_np.c
index 27b5c9b20776..9c1452e96d93 100644
--- a/lib/libc/posix1e/acl_extended_file_np.c
+++ b/lib/libc/posix1e/acl_extended_file_np.c
@@ -29,7 +29,6 @@
* acl_extended_file_np: Check if the file has extended ACLs set.
*/
-#include <sys/cdefs.h>
#include <sys/param.h>
#include <sys/errno.h>
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_flag.c b/lib/libc/posix1e/acl_flag.c
index 82772bf261f1..eaaaecd9a374 100644
--- a/lib/libc/posix1e/acl_flag.c
+++ b/lib/libc/posix1e/acl_flag.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stdio.h>
#include <errno.h>
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_free.c b/lib/libc/posix1e/acl_free.c
index 1de6d3105047..813ec6a35fb6 100644
--- a/lib/libc/posix1e/acl_free.c
+++ b/lib/libc/posix1e/acl_free.c
@@ -29,7 +29,6 @@
* acl_free -- free ACL objects from user memory
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_from_mode_np.c b/lib/libc/posix1e/acl_from_mode_np.c
index b08cc5b5e6a0..3d4135770917 100644
--- a/lib/libc/posix1e/acl_from_mode_np.c
+++ b/lib/libc/posix1e/acl_from_mode_np.c
@@ -29,7 +29,6 @@
* acl_from_mode_np: Create an ACL from a mode_t.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/param.h>
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_from_text.c b/lib/libc/posix1e/acl_from_text.c
index 2a1c21fa7859..765b58290a04 100644
--- a/lib/libc/posix1e/acl_from_text.c
+++ b/lib/libc/posix1e/acl_from_text.c
@@ -29,7 +29,6 @@
* acl_from_text: Convert a text-form ACL from a string to an acl_t.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_from_text_nfs4.c b/lib/libc/posix1e/acl_from_text_nfs4.c
index 41fb96973d91..ed82c1093bc4 100644
--- a/lib/libc/posix1e/acl_from_text_nfs4.c
+++ b/lib/libc/posix1e/acl_from_text_nfs4.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/lib/libc/posix1e/acl_get.3 b/lib/libc/posix1e/acl_get.3
index 1908f0d0d97b..91a3626ada72 100644
--- a/lib/libc/posix1e/acl_get.3
+++ b/lib/libc/posix1e/acl_get.3
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd June 25, 2009
+.Dd September 21, 2023
.Dt ACL_GET 3
.Os
.Sh NAME
@@ -151,16 +151,8 @@ The file system does not support ACL retrieval.
.Xr posix1e 3
.Sh STANDARDS
POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion
-of the draft continues on the cross-platform POSIX.1e implementation
-mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation
-page for more information.
.Sh HISTORY
POSIX.1e support was introduced in
-.Fx 4.0 ,
-and development continues.
+.Fx 4.0 .
.Sh AUTHORS
.An Robert N M Watson
diff --git a/lib/libc/posix1e/acl_get.c b/lib/libc/posix1e/acl_get.c
index f5191d739dcc..a02c2d53085d 100644
--- a/lib/libc/posix1e/acl_get.c
+++ b/lib/libc/posix1e/acl_get.c
@@ -40,7 +40,6 @@
* acl_get_tag_type() returns the tag type for the ACL entry entry_d
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_get_entry.3 b/lib/libc/posix1e/acl_get_entry.3
index 1c6126334fa3..94a95b5412b7 100644
--- a/lib/libc/posix1e/acl_get_entry.3
+++ b/lib/libc/posix1e/acl_get_entry.3
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd April 13, 2001
+.Dd September 21, 2023
.Dt ACL_GET_ENTRY 3
.Os
.Sh NAME
@@ -42,7 +42,7 @@ The
function
is a POSIX.1e call that retrieves a descriptor for an ACL entry
specified by the argument
-.Fa entry_d
+.Fa entry_id
within the ACL indicated by the argument
.Fa acl .
.Pp
@@ -100,7 +100,7 @@ will be set to indicate the error.
.Sh ERRORS
The
.Fn acl_get_entry
-fails if:
+function fails if:
.Bl -tag -width Er
.It Bq Er EINVAL
Argument
diff --git a/lib/libc/posix1e/acl_id_to_name.c b/lib/libc/posix1e/acl_id_to_name.c
index b5afe7d16613..78e050a8648a 100644
--- a/lib/libc/posix1e/acl_id_to_name.c
+++ b/lib/libc/posix1e/acl_id_to_name.c
@@ -30,7 +30,6 @@
* These calls are intended only to be called within the library.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_init.c b/lib/libc/posix1e/acl_init.c
index eaa554df4fe8..587817388081 100644
--- a/lib/libc/posix1e/acl_init.c
+++ b/lib/libc/posix1e/acl_init.c
@@ -30,7 +30,6 @@
* acl_dup -- duplicate an acl and return the new copy
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_perm.c b/lib/libc/posix1e/acl_perm.c
index f6abf404c4f8..9ad103398646 100644
--- a/lib/libc/posix1e/acl_perm.c
+++ b/lib/libc/posix1e/acl_perm.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_set.c b/lib/libc/posix1e/acl_set.c
index 5edc291b5171..359dda2c1619 100644
--- a/lib/libc/posix1e/acl_set.c
+++ b/lib/libc/posix1e/acl_set.c
@@ -31,7 +31,6 @@
* acl_set_file -- set a file/directory ACL by name
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_strip.c b/lib/libc/posix1e/acl_strip.c
index ac6c94e66f86..9af1ad680036 100644
--- a/lib/libc/posix1e/acl_strip.c
+++ b/lib/libc/posix1e/acl_strip.c
@@ -26,7 +26,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <errno.h>
#include <stdio.h>
#include <assert.h>
diff --git a/lib/libc/posix1e/acl_support.c b/lib/libc/posix1e/acl_support.c
index c4552d9799a2..82abeb0273f9 100644
--- a/lib/libc/posix1e/acl_support.c
+++ b/lib/libc/posix1e/acl_support.c
@@ -30,7 +30,6 @@
* These calls are intended only to be called within the library.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/acl_support_nfs4.c b/lib/libc/posix1e/acl_support_nfs4.c
index 9062ec31cd43..08647651933b 100644
--- a/lib/libc/posix1e/acl_support_nfs4.c
+++ b/lib/libc/posix1e/acl_support_nfs4.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/lib/libc/posix1e/acl_to_text.c b/lib/libc/posix1e/acl_to_text.c
index 3b2156c61560..c17253e2cec2 100644
--- a/lib/libc/posix1e/acl_to_text.c
+++ b/lib/libc/posix1e/acl_to_text.c
@@ -30,9 +30,8 @@
* in it.
*/
-#include <sys/cdefs.h>
-#include <sys/types.h>
#include "namespace.h"
+#include <sys/param.h>
#include <sys/acl.h>
#include "un-namespace.h"
#include <sys/errno.h>
diff --git a/lib/libc/posix1e/acl_to_text_nfs4.c b/lib/libc/posix1e/acl_to_text_nfs4.c
index 522ebe3d4373..157215c9dd52 100644
--- a/lib/libc/posix1e/acl_to_text_nfs4.c
+++ b/lib/libc/posix1e/acl_to_text_nfs4.c
@@ -25,7 +25,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -73,6 +72,7 @@ format_who(char *str, size_t size, const acl_entry_t entry, int numeric)
snprintf(str, size, "user:%d", (unsigned int)*id);
else
snprintf(str, size, "user:%s", pwd->pw_name);
+ acl_free(id);
break;
case ACL_GROUP_OBJ:
@@ -92,6 +92,7 @@ format_who(char *str, size_t size, const acl_entry_t entry, int numeric)
snprintf(str, size, "group:%d", (unsigned int)*id);
else
snprintf(str, size, "group:%s", grp->gr_name);
+ acl_free(id);
break;
case ACL_EVERYONE:
@@ -158,6 +159,7 @@ format_additional_id(char *str, size_t size, const acl_entry_t entry)
if (id == NULL)
return (-1);
snprintf(str, size, ":%d", (unsigned int)*id);
+ acl_free(id);
}
return (0);
diff --git a/lib/libc/posix1e/acl_valid.c b/lib/libc/posix1e/acl_valid.c
index b0468d5a57d8..c804b0840307 100644
--- a/lib/libc/posix1e/acl_valid.c
+++ b/lib/libc/posix1e/acl_valid.c
@@ -31,7 +31,6 @@
* acl_valid -- POSIX.1e ACL check routine
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include "namespace.h"
#include <sys/acl.h>
diff --git a/lib/libc/posix1e/extattr.c b/lib/libc/posix1e/extattr.c
index 816b3a6952ad..6938c302b8a4 100644
--- a/lib/libc/posix1e/extattr.c
+++ b/lib/libc/posix1e/extattr.c
@@ -29,7 +29,6 @@
* TrustedBSD: Utility functions for extended attributes.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/extattr.h>
diff --git a/lib/libc/posix1e/mac.c b/lib/libc/posix1e/mac.c
index c1bfcf15969a..8f3a63e40ac5 100644
--- a/lib/libc/posix1e/mac.c
+++ b/lib/libc/posix1e/mac.c
@@ -34,7 +34,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
diff --git a/lib/libc/posix1e/mac_exec.c b/lib/libc/posix1e/mac_exec.c
index acd7c1d6e828..3016f21edd0d 100644
--- a/lib/libc/posix1e/mac_exec.c
+++ b/lib/libc/posix1e/mac_exec.c
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/mac.h>
diff --git a/lib/libc/posix1e/mac_free.3 b/lib/libc/posix1e/mac_free.3
index 987bd9966564..4ed68b70f3a3 100644
--- a/lib/libc/posix1e/mac_free.3
+++ b/lib/libc/posix1e/mac_free.3
@@ -31,7 +31,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd December 21, 2001
+.Dd September 21, 2023
.Dt MAC_FREE 3
.Os
.Sh NAME
@@ -67,12 +67,6 @@ function.
.Xr mac 9
.Sh STANDARDS
POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft
-continues on the cross-platform POSIX.1e implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page
-for more information.
.Sh HISTORY
Support for Mandatory Access Control was introduced in
.Fx 5.0
diff --git a/lib/libc/posix1e/mac_get.3 b/lib/libc/posix1e/mac_get.3
index 45045977fb32..171f7cd91aaf 100644
--- a/lib/libc/posix1e/mac_get.3
+++ b/lib/libc/posix1e/mac_get.3
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd December 21, 2001
+.Dd September 21, 2023
.Dt MAC_GET 3
.Os
.Sh NAME
@@ -136,12 +136,6 @@ is not a directory.
.Xr mac 9
.Sh STANDARDS
POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft
-continues on the cross-platform POSIX.1e implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page
-for more information.
.Sh HISTORY
Support for Mandatory Access Control was introduced in
.Fx 5.0
diff --git a/lib/libc/posix1e/mac_get.c b/lib/libc/posix1e/mac_get.c
index 5bf829e9a160..5bfc0a549754 100644
--- a/lib/libc/posix1e/mac_get.c
+++ b/lib/libc/posix1e/mac_get.c
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/mac.h>
#include <sys/socket.h>
diff --git a/lib/libc/posix1e/mac_prepare.3 b/lib/libc/posix1e/mac_prepare.3
index 58493e988a0b..50dfa1c28d2d 100644
--- a/lib/libc/posix1e/mac_prepare.3
+++ b/lib/libc/posix1e/mac_prepare.3
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd August 22, 2003
+.Dd September 21, 2023
.Dt MAC_PREPARE 3
.Os
.Sh NAME
@@ -108,12 +108,6 @@ respectively.
.Xr maclabel 7
.Sh STANDARDS
POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft
-continues on the cross-platform POSIX.1e implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page
-for more information.
.Sh HISTORY
Support for Mandatory Access Control was introduced in
.Fx 5.0
diff --git a/lib/libc/posix1e/mac_set.c b/lib/libc/posix1e/mac_set.c
index cded5a7cca70..8197d4354910 100644
--- a/lib/libc/posix1e/mac_set.c
+++ b/lib/libc/posix1e/mac_set.c
@@ -31,7 +31,6 @@
* SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
#include <sys/types.h>
#include <sys/mac.h>
diff --git a/lib/libc/posix1e/mac_text.3 b/lib/libc/posix1e/mac_text.3
index 88131f0bf611..29c1aacca485 100644
--- a/lib/libc/posix1e/mac_text.3
+++ b/lib/libc/posix1e/mac_text.3
@@ -28,7 +28,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd December 21, 2001
+.Dd September 21, 2023
.Dt MAC_TEXT 3
.Os
.Sh NAME
@@ -101,12 +101,6 @@ to allocate internal storage.
.Xr maclabel 7
.Sh STANDARDS
POSIX.1e is described in IEEE POSIX.1e draft 17.
-Discussion of the draft
-continues on the cross-platform POSIX.1e implementation mailing list.
-To join this list, see the
-.Fx
-POSIX.1e implementation page
-for more information.
.Sh HISTORY
Support for Mandatory Access Control was introduced in
.Fx 5.0
diff --git a/lib/libc/posix1e/posix1e.3 b/lib/libc/posix1e/posix1e.3
index 8eef3bb21724..1dbe12427da1 100644
--- a/lib/libc/posix1e/posix1e.3
+++ b/lib/libc/posix1e/posix1e.3
@@ -46,7 +46,7 @@ its interfaces are widely used.
implements POSIX.1e interface for access control lists, described in
.Xr acl 3 ,
and supports ACLs on the
-.Xr ffs 7
+.Xr ffs 4
file system; ACLs must be administratively enabled using
.Xr tunefs 8 .
.Pp
@@ -95,7 +95,7 @@ for mandatory access control labels.
.Xr libcasper 3 ,
.Xr mac 3 ,
.Xr capsicum 4 ,
-.Xr ffs 7 ,
+.Xr ffs 4 ,
.Xr getfmac 8 ,
.Xr setfmac 8 ,
.Xr tunefs 8 ,