Date: Sun, 12 May 2002 09:30:48 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 11217 for review Message-ID: <200205121630.g4CGUlk21362@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11217 Change 11217 by rwatson@rwatson_curry on 2002/05/12 09:30:27 Remove per-policy #define's for Biba and MLS from mac.h, update the policy implementations to #include their per-policy include files to get the definitions back. Affected files ... ... //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#36 edit ... //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#30 edit ... //depot/projects/trustedbsd/mac/sys/sys/mac.h#101 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#36 (text+ko) ==== @@ -63,6 +63,8 @@ #include <net/if_types.h> #include <net/if_var.h> +#include <security/mac_biba/mac_biba.h> + SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, biba, CTLFLAG_RW, 0, ==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#30 (text+ko) ==== @@ -63,6 +63,8 @@ #include <net/if_types.h> #include <net/if_var.h> +#include <security/mac_mls/mac_mls.h> + SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, mls, CTLFLAG_RW, 0, ==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#101 (text+ko) ==== @@ -56,7 +56,8 @@ * Structures and constants associated with a Biba Integrity policy. * mac_biba represents a Biba label, with mb_type determining its properties, * and mb_grade represents the hierarchal grade if valid for the current - * mb_type. + * mb_type. These structures will move to mac_biba.h once we have dymamic + * labels. */ struct mac_biba_element { u_short mbe_type; @@ -75,24 +76,12 @@ struct mac_biba_element mb_rangelow, mb_rangehigh; }; -#define MAC_BIBA_FLAG_SINGLE 0x00000001 /* mb_single initialized */ -#define MAC_BIBA_FLAG_RANGE 0x00000002 /* mb_range* initialized */ -#define MAC_BIBA_FLAGS_BOTH (MAC_BIBA_FLAG_SINGLE | MAC_BIBA_FLAG_RANGE) - -#define MAC_BIBA_TYPE_UNDEF 0 /* Undefined */ -#define MAC_BIBA_TYPE_GRADE 1 /* Hierarchal grade with mb_grade. */ -#define MAC_BIBA_TYPE_LOW 2 /* Dominated by any - * MAC_BIBA_TYPE_LABEL. */ -#define MAC_BIBA_TYPE_HIGH 3 /* Dominates any - * MAC_BIBA_TYPE_LABEL. */ -#define MAC_BIBA_TYPE_EQUAL 4 /* Equivilent to any - * MAC_BIBA_TYPE_LABEL. */ - /* * Structures and constants associated with a Multi-Level Security policy. * mac_mls represents an MLS label, with mm_type determining its properties, * and mm_level represents the hierarchal sensitivity level if valid for the - * current mm_type. + * current mm_type. These structures will move to mac_mls.h once we have + * dynamic labels. */ struct mac_mls_element { u_short mme_type; @@ -111,19 +100,6 @@ struct mac_mls_element mm_rangelow, mm_rangehigh; }; -#define MAC_MLS_FLAG_SINGLE 0x00000001 /* mm_single initialized */ -#define MAC_MLS_FLAG_RANGE 0x00000002 /* mm_range* initialized */ -#define MAC_MLS_FLAGS_BOTH (MAC_MLS_FLAG_SINGLE | MAC_MLS_FLAG_RANGE) - -#define MAC_MLS_TYPE_UNDEF 0 /* Undefined */ -#define MAC_MLS_TYPE_LEVEL 1 /* Hierarchal level with mm_level. */ -#define MAC_MLS_TYPE_LOW 2 /* Dominated by any - * MAC_MLS_TYPE_LABEL. */ -#define MAC_MLS_TYPE_HIGH 3 /* Dominates any - * MAC_MLS_TYPE_LABEL. */ -#define MAC_MLS_TYPE_EQUAL 4 /* Equivilent to any - * MAC_MLS_TYPE_LABEL. */ - /* * Structures and constants associated with a Type Enforcement policy. * mac_te represents a Type Enforcement label. 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?200205121630.g4CGUlk21362>