From owner-p4-projects@FreeBSD.ORG  Tue Oct 21 08:15:31 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C98D916A4C0; Tue, 21 Oct 2003 08:15:30 -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 A30F716A4B3
	for <perforce@freebsd.org>; Tue, 21 Oct 2003 08:15:30 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CA82043FB1
	for <perforce@freebsd.org>; Tue, 21 Oct 2003 08:15:29 -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 h9LFFTXJ076839
	for <perforce@freebsd.org>; Tue, 21 Oct 2003 08:15:29 -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 h9LFFT5J076836
	for perforce@freebsd.org; Tue, 21 Oct 2003 08:15:29 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 21 Oct 2003 08:15:29 -0700 (PDT)
Message-Id: <200310211515.h9LFFT5J076836@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 40092 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 15:15:31 -0000

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

Change 40092 by rwatson@rwatson_tislabs on 2003/10/21 08:14:55

	Integrate C++ism from the FreeBSD main tree to the TrustedBSD
	base tree to bring the framework components into sync for
	the merge of the MAC Framework breakout to the main tree.

Affected files ...

.. //depot/projects/trustedbsd/base/sys/sys/mac.h#33 integrate

Differences ...

==== //depot/projects/trustedbsd/base/sys/sys/mac.h#33 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/sys/mac.h,v 1.45 2003/08/29 02:43:57 rwatson Exp $
+ * $FreeBSD: src/sys/sys/mac.h,v 1.46 2003/10/02 03:07:51 rwatson Exp $
  */
 /*
  * Userland/kernel interface for Mandatory Access Control.
@@ -76,6 +76,7 @@
  * Extended non-POSIX.1e interfaces that offer additional services
  * available from the userland and kernel MAC frameworks.
  */
+__BEGIN_DECLS
 int	 mac_execve(char *fname, char **argv, char **envv, mac_t _label);
 int	 mac_free(mac_t _label);
 int	 mac_from_text(mac_t *_label, const char *_text);
@@ -96,6 +97,7 @@
 int	 mac_set_proc(const mac_t _label);
 int	 mac_syscall(const char *_policyname, int _call, void *_arg);
 int	 mac_to_text(mac_t mac, char **_text);
+__END_DECLS
 
 #else /* _KERNEL */