PERFORCE change 17419 for review

[Robert Watson]

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

Change 17419 by rwatson at rwatson_sproing on 2002/09/12 13:44:01

	Fix kasserts with incorrect variable names; because we built these
	policies only as modules, we didn't get INVARIANTS set.  This
	fixes the INVARIANTS build of mac_mls and mac_biba.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#102 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#84 edit

Differences ...

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

@@ -205,9 +205,9 @@
 mac_biba_single_in_range(struct mac_biba *single, struct mac_biba *range)
 {
 
-	KASSERT((single->mb_flag & MAC_BIBA_FLAG_SINGLE) != 0,
+	KASSERT((single->mb_flags & MAC_BIBA_FLAG_SINGLE) != 0,
 	    ("mac_biba_single_in_range: a not single"));
-	KASSERT((range->mb_flag & MAC_BIBA_FLAG_RANGE) != 0,
+	KASSERT((range->mb_flags & MAC_BIBA_FLAG_RANGE) != 0,
 	    ("mac_biba_single_in_range: b not range"));
 
 	return (mac_biba_dominate_element(&range->mb_rangehigh,

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

@@ -195,9 +195,9 @@
 mac_mls_single_in_range(struct mac_mls *single, struct mac_mls *range)
 {
 
-	KASSERT((single->mm_flag & MAC_MLS_FLAG_SINGLE) != 0,
+	KASSERT((single->mm_flags & MAC_MLS_FLAG_SINGLE) != 0,
 	    ("mac_mls_single_in_range: a not single"));
-	KASSERT((range->mm_flag & MAC_MLS_FLAG_RANGE) != 0,
+	KASSERT((range->mm_flags & MAC_MLS_FLAG_RANGE) != 0,
 	    ("mac_mls_single_in_range: b not range"));
 
 	return (mac_mls_dominate_element(&range->mm_rangehigh,
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message