Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 May 2002 11:43:09 -0700 (PDT)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 10706 for review
Message-ID:  <200205021843.g42Ih9T83693@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205021843.g42Ih9T83693>