From owner-p4-projects  Tue Feb  4  6:45:23 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F131B37B405; Tue,  4 Feb 2003 06:45:21 -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 B5F8937B401
	for <perforce@freebsd.org>; Tue,  4 Feb 2003 06:45:21 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AEF4C43F9B
	for <perforce@freebsd.org>; Tue,  4 Feb 2003 06:45:20 -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 h14EjKbv040126
	for <perforce@freebsd.org>; Tue, 4 Feb 2003 06:45:20 -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 h14EjK0N040123
	for perforce@freebsd.org; Tue, 4 Feb 2003 06:45:20 -0800 (PST)
Date: Tue, 4 Feb 2003 06:45:20 -0800 (PST)
Message-Id: <200302041445.h14EjK0N040123@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 24652 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=24652

Change 24652 by rwatson@rwatson_tislabs on 2003/02/04 06:45:02

	Fix copy-and-paste-o on the comments in the relabeling code:
	we're checking the "new" label, not the "current" label in this
	check, unlike the prior check.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#195 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#154 edit

Differences ...

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

@@ -1449,7 +1449,7 @@
 
 		/*
 		 * To change the Biba range on a credential, the new
-		 * range label must be in the current range.
+		 * range label must be in the new range.
 		 */
 		if (new->mb_flags & MAC_BIBA_FLAG_RANGE &&
 		    !mac_biba_range_in_range(new, subj))

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

@@ -1387,7 +1387,7 @@
 
 		/*
 		 * To change the MLS range label on a credential, the
-		 * new range label must be in the current range.
+		 * new range label must be in the new range.
 		 */
 		if (new->mm_flags & MAC_MLS_FLAG_RANGE &&
 		    !mac_mls_range_in_range(new, subj))

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