From owner-p4-projects  Tue Feb  4 13: 7:15 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0929837B405; Tue,  4 Feb 2003 13:07:13 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 92EF337B401
	for <perforce@freebsd.org>; Tue,  4 Feb 2003 13:07:12 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 03DBF43F9B
	for <perforce@freebsd.org>; Tue,  4 Feb 2003 13:07:11 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h14L7Bbv077417
	for <perforce@freebsd.org>; Tue, 4 Feb 2003 13:07:11 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h14L7BI8077414
	for perforce@freebsd.org; Tue, 4 Feb 2003 13:07:11 -0800 (PST)
Date: Tue, 4 Feb 2003 13:07:11 -0800 (PST)
Message-Id: <200302042107.h14L7BI8077414@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 24668 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=24668

Change 24668 by rwatson@rwatson_tislabs on 2003/02/04 13:06:34

	Mirror a similar fix in mac_biba: use 'type', not 'level' when
	parsing and generating MLS label types.  This is probably left
	over from a simpler time.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#156 edit

Differences ...

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

@@ -1123,17 +1123,17 @@
 mac_mls_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel)
 {
 	struct mac_mls *dest;
-	int level;
+	int type;
 
 	dest = SLOT(ifnetlabel);
 
 	if (ifnet->if_type == IFT_LOOP)
-		level = MAC_MLS_TYPE_EQUAL;
+		type = MAC_MLS_TYPE_EQUAL;
 	else
-		level = MAC_MLS_TYPE_LOW;
+		type = MAC_MLS_TYPE_LOW;
 
-	mac_mls_set_single(dest, level, 0, NULL);
-	mac_mls_set_range(dest, level, 0, NULL, level, 0, NULL);
+	mac_mls_set_single(dest, type, 0, NULL);
+	mac_mls_set_range(dest, type, 0, NULL, type, 0, NULL);
 }
 
 static void

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message