From owner-p4-projects@FreeBSD.ORG  Tue Nov 14 18:27:43 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DBA7F16A415; Tue, 14 Nov 2006 18:27:42 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B453B16A40F
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 18:27:42 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6BC8543D4C
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 18:27:42 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAEIRgnV006371
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 18:27:42 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAEIRgXJ006368
	for perforce@freebsd.org; Tue, 14 Nov 2006 18:27:42 GMT
	(envelope-from millert@freebsd.org)
Date: Tue, 14 Nov 2006 18:27:42 GMT
Message-Id: <200611141827.kAEIRgXJ006368@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109950 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Nov 2006 18:27:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=109950

Change 109950 by millert@millert_g5tower on 2006/11/14 18:27:13

	Remove mac_enforce toggle

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_file.c#4 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_file.c#4 (text+ko) ====

@@ -44,15 +44,9 @@
 #include <sys/vnode_internal.h>
 #include <sys/file.h>
 #include <sys/file_internal.h>
-#include <sys/sysctl.h>
 
 #include <security/mac_internal.h>
 
-static int	mac_enforce_file = 1;
-SYSCTL_INT(_security_mac, OID_AUTO, enforce_file, CTLFLAG_RW,
-    &mac_enforce_file, 0, "Enforce MAC policy on file descriptors");
-TUNABLE_INT("security.mac.enforce_file", &mac_enforce_file);
-
 static struct label *
 mac_file_label_alloc(void)
 {
@@ -98,8 +92,6 @@
 {
 	int error;
 
-	if (!mac_enforce_file)
-		return (0);
 	MAC_CHECK(file_check_create, cred);
 	return (error);
 }
@@ -109,8 +101,6 @@
 {
 	int error;
 
-	if (!mac_enforce_file)
-		return (0);
 	MAC_CHECK(file_check_dup, cred, fg, fg->fg_label, newfd);
 	return (error);
 }
@@ -130,8 +120,6 @@
 {
 	int error;
 
-	if (!mac_enforce_file)
-		return (0);
 	MAC_CHECK(file_check_ioctl, cred, fg, fg->fg_label, cmd, data);
 	return (error);
 }
@@ -141,8 +129,6 @@
 {
 	int error;
 
-	if (!mac_enforce_file)
-		return (0);
 	MAC_CHECK(file_check_inherit, cred, fg, fg->fg_label);
 	return (error);
 }
@@ -152,8 +138,6 @@
 {
 	int error;
 
-	if (!mac_enforce_file)
-		return (0);
 	MAC_CHECK(file_check_receive, cred, fg, fg->fg_label);
 	return (error);
 }
@@ -164,8 +148,6 @@
 {
 	int error;
 
-	if (!mac_enforce_file)
-		return (0);
 	MAC_CHECK(file_check_get_flags, cred, fg, fg->fg_label, flags);
 	return (error);
 }
@@ -176,8 +158,6 @@
 {
 	int error;
 
-	if (!mac_enforce_file)
-		return (0);
 	MAC_CHECK(file_check_get_ofileflags, cred, fg, fg->fg_label, flags);
 	return (error);
 }
@@ -188,8 +168,6 @@
 {
 	int error;
 
-	if (!mac_enforce_file)
-		return (0);
 	MAC_CHECK(file_check_change_flags, cred, fg, fg->fg_label, oldflags,
 	    newflags);
 	return (error);
@@ -201,8 +179,6 @@
 {
 	int error;
 
-	if (!mac_enforce_file)
-		return (0);
 	MAC_CHECK(file_check_change_ofileflags, cred, fg, fg->fg_label,
 	    oldflags, newflags);
 	return (error);
@@ -213,8 +189,6 @@
 {
 	int error;
 
-	if (!mac_enforce_file)
-		return (0);
 	MAC_CHECK(file_check_get_offset, cred, fg, fg->fg_label);
 	return (error);
 }
@@ -224,8 +198,6 @@
 {
 	int error;
 
-	if (!mac_enforce_file)
-		return (0);
 	MAC_CHECK(file_check_change_offset, cred, fg, fg->fg_label);
 	return (error);
 }