Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Mar 2002 13:10:51 -0800 (PST)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 8403 for review
Message-ID:  <200203252110.g2PLApq09436@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8403

Change 8403 by rwatson@rwatson_tislabs on 2002/03/25 13:10:36

	Build mac_bsdextended only as a kernel module, not as a kernel
	compile option.  Since it doesn't require space in the MAC
	label or need early initialization, there's no reason to compile
	it in.

Affected files ...

... //depot/projects/trustedbsd/mac/sys/conf/files#21 edit
... //depot/projects/trustedbsd/mac/sys/conf/options#12 edit
... //depot/projects/trustedbsd/mac/sys/modules/mac_bsdextended/Makefile#2 edit
... //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#25 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/conf/files#21 (text+ko) ====

@@ -1267,7 +1267,6 @@
 posix4/p1003_1b.c	standard
 posix4/posix4_mib.c	standard
 security/mac_biba/mac_biba.c	optional mac_biba
-security/mac_bsdextended/mac_bsdextended.c	optional mac_bsdextended
 security/mac_mls/mac_mls.c	optional mac_mls
 security/mac_none/mac_none.c	optional mac_none
 security/mac_te/mac_te.c	optional mac_te

==== //depot/projects/trustedbsd/mac/sys/conf/options#12 (text+ko) ====

@@ -109,7 +109,6 @@
 CAPABILITIES	opt_cap.h
 MAC		opt_mac.h
 MAC_BIBA	opt_mac.h
-MAC_BSDEXTENDED	opt_mac.h
 MAC_MLS		opt_mac.h
 MAC_NONE	opt_mac.h
 MAC_TE		opt_mac.h

==== //depot/projects/trustedbsd/mac/sys/modules/mac_bsdextended/Makefile#2 (text+ko) ====

@@ -4,7 +4,6 @@
 
 KMOD=	mac_bsdextended
 SRCS=	vnode_if.h \
-	opt_mac.h \
 	mac_bsdextended.c
 
 .include <bsd.kmod.mk>

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

@@ -44,8 +44,6 @@
  * XXX: Much locking support required here.
  */
 
-#include "opt_mac.h"
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -71,8 +69,6 @@
 
 #include <security/mac_bsdextended/mac_bsdextended.h>
 
-#ifdef MAC
-
 SYSCTL_DECL(_security_mac);
 
 SYSCTL_NODE(_security_mac, OID_AUTO, bsdextended, CTLFLAG_RW, 0,
@@ -658,4 +654,3 @@
 
 MAC_POLICY_SET(mac_bsdextended_ops, trustedbsd_mac_bsdextended,
     "TrustedBSD MAC/BSD Extended", 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?200203252110.g2PLApq09436>