Author: brd
Date: Tue Sep 18 01:40:37 2018
New Revision: 338745
URL: https://svnweb.freebsd.org/changeset/base/338745

Log:
  Move mac.conf to lib/libc/posix1e/
  
  This leverages CONFS to handle the install of the config file.
  
  Approved by:  re (blanket, pkgbase), will (mentor)
  Differential Revision:        https://reviews.freebsd.org/D17162

Added:
  head/lib/libc/posix1e/mac.conf
     - copied unchanged from r338744, head/etc/mac.conf
Deleted:
  head/etc/mac.conf
Modified:
  head/etc/Makefile
  head/lib/libc/posix1e/Makefile.inc

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile   Tue Sep 18 01:38:44 2018        (r338744)
+++ head/etc/Makefile   Tue Sep 18 01:40:37 2018        (r338745)
@@ -18,7 +18,6 @@ BIN1= \
        hosts.allow \
        libalias.conf \
        login.access \
-       mac.conf \
        phones \
        rc.bsdextended \
        rc.firewall \

Modified: head/lib/libc/posix1e/Makefile.inc
==============================================================================
--- head/lib/libc/posix1e/Makefile.inc  Tue Sep 18 01:38:44 2018        
(r338744)
+++ head/lib/libc/posix1e/Makefile.inc  Tue Sep 18 01:40:37 2018        
(r338745)
@@ -8,6 +8,7 @@ CFLAGS+=-D_ACL_PRIVATE
 subr_acl_nfs4.c: ${SRCTOP}/sys/kern/subr_acl_nfs4.c
        cat ${.ALLSRC} > ${.TARGET}
 
+CONFS+=        posix1e/mac.conf
 SRCS+= acl_branding.c                  \
        acl_calc_mask.c                 \
        acl_copy.c                      \

Copied: head/lib/libc/posix1e/mac.conf (from r338744, head/etc/mac.conf)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/lib/libc/posix1e/mac.conf      Tue Sep 18 01:40:37 2018        
(r338745, copy of r338744, head/etc/mac.conf)
@@ -0,0 +1,18 @@
+#
+# $FreeBSD$
+#
+# TrustedBSD MAC userland policy configuration file.  Kernel modules
+# export label information, and mac.conf indicates to userland
+# applications what defaults they should use in the absence of any
+# other user-provided information.
+#
+
+#
+# Default label set to be used by simple MAC applications
+#
+
+default_labels file ?biba,?lomac,?mls,?sebsd
+default_labels ifnet ?biba,?lomac,?mls,?sebsd
+default_labels process ?biba,?lomac,?mls,?partition,?sebsd
+default_labels socket ?biba,?lomac,?mls
+
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to