From owner-svn-src-head@freebsd.org Tue Sep 18 01:40:38 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 414CA108292A; Tue, 18 Sep 2018 01:40:38 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id EAE5C761A6; Tue, 18 Sep 2018 01:40:37 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E5FAE1926B; Tue, 18 Sep 2018 01:40:37 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8I1ebj3057477; Tue, 18 Sep 2018 01:40:37 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8I1eb35057475; Tue, 18 Sep 2018 01:40:37 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201809180140.w8I1eb35057475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Tue, 18 Sep 2018 01:40:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r338745 - in head: etc lib/libc/posix1e X-SVN-Group: head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head: etc lib/libc/posix1e X-SVN-Commit-Revision: 338745 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Sep 2018 01:40:38 -0000 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 +