From owner-p4-projects@FreeBSD.ORG  Mon Oct 20 17:54:06 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 665D516A4C1; Mon, 20 Oct 2003 17:54:06 -0700 (PDT)
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 3FE9A16A4B3
	for <perforce@freebsd.org>; Mon, 20 Oct 2003 17:54:06 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 437AE43FA3
	for <perforce@freebsd.org>; Mon, 20 Oct 2003 17:54:05 -0700 (PDT)
	(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.9/8.12.9) with ESMTP id h9L0s5XJ009987
	for <perforce@freebsd.org>; Mon, 20 Oct 2003 17:54:05 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9L0s4Hv009984
	for perforce@freebsd.org; Mon, 20 Oct 2003 17:54:04 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 20 Oct 2003 17:54:04 -0700 (PDT)
Message-Id: <200310210054.h9L0s4Hv009984@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 40051 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, 21 Oct 2003 00:54:06 -0000

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

Change 40051 by rwatson@rwatson_tislabs on 2003/10/20 17:53:52

	Export mac_labelmbufs globally from kern_mac.c: it probably
	belongs in mac_net.c, but flag ownership isn't figured out yet.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#416 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#5 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#416 (text+ko) ====

@@ -133,7 +133,7 @@
  * be a problem.  Note: currently no locking.  Will this be a problem?
  */
 #ifndef MAC_ALWAYS_LABEL_MBUF
-static int	mac_labelmbufs = 0;
+int	mac_labelmbufs = 0;
 #endif
 
 static int	mac_enforce_fs = 1;

==== //depot/projects/trustedbsd/mac/sys/security/mac/mac_internal.h#5 (text+ko) ====

@@ -56,6 +56,9 @@
 extern struct mac_policy_list_head	mac_static_policy_list;
 extern int				mac_late;
 extern int				mac_enforce_sysv;
+#ifndef MAC_ALWAYS_LABEL_MBUF
+extern int				mac_labelmbufs;
+#endif
 
 /*
  * MAC Framework global types and constants.