Date: Wed, 1 May 2002 22:20:43 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10656 for review Message-ID: <200205020520.g425Khc86838@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10656 Change 10656 by rwatson@rwatson_tislabs on 2002/05/01 22:20:25 Since biba, mls, and te are no longer built directly into the kernel, their #ifdef of MAC is no longer required. Also drop the include of opt_mac.h, since there are not currently any other relevant compile-time options in there (there may be at some point, in which case we'll re-add them). Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#35 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#29 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#30 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#35 (text+ko) ==== @@ -41,8 +41,6 @@ * Biba Integrity Policy. */ -#include "opt_mac.h" - #include <sys/types.h> #include <sys/param.h> #include <sys/conf.h> @@ -65,8 +63,6 @@ #include <net/if_types.h> #include <net/if_var.h> -#ifdef MAC - SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, biba, CTLFLAG_RW, 0, @@ -1221,4 +1217,3 @@ MAC_POLICY_SET(mac_biba_ops, trustedbsd_mac_biba, "TrustedBSD MAC/Biba", MPC_LOADTIME_FLAG_NOTLATE, 1); -#endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#29 (text+ko) ==== @@ -41,8 +41,6 @@ * Multi-Level Security Policy. */ -#include "opt_mac.h" - #include <sys/types.h> #include <sys/param.h> #include <sys/conf.h> @@ -65,8 +63,6 @@ #include <net/if_types.h> #include <net/if_var.h> -#ifdef MAC - SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, mls, CTLFLAG_RW, 0, @@ -1154,4 +1150,3 @@ MAC_POLICY_SET(mac_mls_ops, trustedbsd_mac_mls, "TrustedBSD MAC/MLS", MPC_LOADTIME_FLAG_NOTLATE, 1); -#endif /* !MAC */ ==== //depot/projects/trustedbsd/mac/sys/security/mac_te/mac_te.c#30 (text+ko) ==== @@ -42,8 +42,6 @@ * Support for mandatory Type Enforcement policy. */ -#include "opt_mac.h" - #include <sys/types.h> #include <sys/param.h> #include <sys/conf.h> @@ -68,8 +66,6 @@ #include <security/mac_te/mac_te.h> -#ifdef MAC - SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, te, CTLFLAG_RW, 0, @@ -1240,5 +1236,3 @@ MAC_POLICY_SET(mac_te_ops, trustedbsd_mac_te, "TrustedBSD MAC/TE", MPC_LOADTIME_FLAG_NOTLATE, 1); - -#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?200205020520.g425Khc86838>