From owner-p4-projects@FreeBSD.ORG  Thu Jul  6 11:58:36 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 0C9CE16A4DF; Thu,  6 Jul 2006 11:58:36 +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 C73F316A4DD
	for <perforce@freebsd.org>; Thu,  6 Jul 2006 11:58:35 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8F2C243D45
	for <perforce@freebsd.org>; Thu,  6 Jul 2006 11:58:35 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66BwZA6068578
	for <perforce@freebsd.org>; Thu, 6 Jul 2006 11:58:35 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66BwZL3068575
	for perforce@freebsd.org; Thu, 6 Jul 2006 11:58:35 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 6 Jul 2006 11:58:35 GMT
Message-Id: <200607061158.k66BwZL3068575@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>
Cc: 
Subject: PERFORCE change 100732 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: Thu, 06 Jul 2006 11:58:36 -0000

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

Change 100732 by rwatson@rwatson_zoo on 2006/07/06 11:57:44

	Remove premature removal of ifndef on system calls, as mac.h needs
	to be included in kernel, and user space prototypes aren't
	desirbale.

Affected files ...

.. //depot/projects/trustedbsd/mac2/sys/sys/mac.h#3 edit

Differences ...

==== //depot/projects/trustedbsd/mac2/sys/sys/mac.h#3 (text+ko) ====

@@ -68,6 +68,7 @@
 
 typedef struct mac	*mac_t;
 
+#ifndef _KERNEL
 /*
  * Location of the userland MAC framework configuration file.  mac.conf
  * binds policy names to shared libraries that understand those policies,
@@ -102,5 +103,6 @@
 int	 mac_syscall(const char *_policyname, int _call, void *_arg);
 int	 mac_to_text(mac_t mac, char **_text);
 __END_DECLS
+#endif
 
 #endif /* !_SYS_MAC_H_ */