From owner-p4-projects@FreeBSD.ORG  Tue Jan 20 10:21:59 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0168816A4D0; Tue, 20 Jan 2004 10:21:58 -0800 (PST)
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 C3C2916A4CE
	for <perforce@freebsd.org>; Tue, 20 Jan 2004 10:21:58 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 996FB43D2D
	for <perforce@freebsd.org>; Tue, 20 Jan 2004 10:21:39 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0KILd0B058758
	for <perforce@freebsd.org>; Tue, 20 Jan 2004 10:21:39 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0KILdpO058749
	for perforce@freebsd.org; Tue, 20 Jan 2004 10:21:39 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 20 Jan 2004 10:21:39 -0800 (PST)
Message-Id: <200401201821.i0KILdpO058749@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45643 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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, 20 Jan 2004 18:21:59 -0000

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

Change 45643 by rwatson@rwatson_tislabs on 2004/01/20 10:20:38

	Pay attention to mac_portacl_enabled.
	
	Submitted by:	simon@FreeBSD.org

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_portacl/mac_portacl.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/mac_portacl/mac_portacl.c#3 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2003 Networks Associates Technology, Inc.
+ * Copyright (c) 2003-2004 Networks Associates Technology, Inc.
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by Network
@@ -451,6 +451,10 @@
 	int family, type;
 	u_int16_t port;
 
+	/* Only run if we are enabled. */
+	if (mac_portacl_enabled == 0)
+		return (0);
+
 	/* Only interested in IPv4 and IPv6 sockets. */
 	if (so->so_proto->pr_domain->dom_family != PF_INET &&
 	    so->so_proto->pr_domain->dom_family != PF_INET6)