From owner-p4-projects  Thu May  2 11:43:21 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 28F5937B417; Thu,  2 May 2002 11:43:10 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 74D1637B416
	for <perforce@freebsd.org>; Thu,  2 May 2002 11:43:09 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g42Ih9T83693
	for perforce@freebsd.org; Thu, 2 May 2002 11:43:09 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Thu, 2 May 2002 11:43:09 -0700 (PDT)
Message-Id: <200205021843.g42Ih9T83693@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 10706 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10706

Change 10706 by rwatson@rwatson_tislabs on 2002/05/02 11:42:08

	Don't #ifdef MAC the mac_none code; the file is either built
	as part of mac_none.ko, in which case all the code is wanted,
	or it's built into the kernel conditional on the option, in
	which case it's wanted.

Affected files ...

... //depot/projects/trustedbsd/mac/sys/security/mac_none/mac_none.c#26 edit

Differences ...

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

@@ -42,8 +42,6 @@
  * Generic mandatory access module that does nothing.
  */
 
-#include "opt_mac.h"
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -66,8 +64,6 @@
 #include <net/if_types.h>
 #include <net/if_var.h>
 
-#ifdef MAC
-
 SYSCTL_DECL(_security_mac);
 
 SYSCTL_NODE(_security_mac, OID_AUTO, none, CTLFLAG_RW, 0,
@@ -769,5 +765,3 @@
 };
 
 MAC_POLICY_SET(mac_none_ops, trustedbsd_mac_none, "TrustedBSD MAC/None", 0, 0);
-
-#endif /* !MAC */

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message