From owner-p4-projects@FreeBSD.ORG  Sat May 31 15:01:00 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9B64437B405; Sat, 31 May 2003 15:00:59 -0700 (PDT)
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 47B2737B404
	for <perforce@freebsd.org>; Sat, 31 May 2003 15:00:59 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E011143F3F
	for <perforce@freebsd.org>; Sat, 31 May 2003 15:00:58 -0700 (PDT)
	(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 h4VM0w0U043095
	for <perforce@freebsd.org>; Sat, 31 May 2003 15:00:58 -0700 (PDT)
	(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 h4VM0wGI043092
	for perforce@freebsd.org; Sat, 31 May 2003 15:00:58 -0700 (PDT)
Date: Sat, 31 May 2003 15:00:58 -0700 (PDT)
Message-Id: <200305312200.h4VM0wGI043092@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>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 32230 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 May 2003 22:01:00 -0000

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

Change 32230 by rwatson@rwatson_tislabs on 2003/05/31 15:00:05

	execlabel is not always defined; if execlabel isn't defined,
	don't run assertions on it.
	
	execlabel will be a cred label when it is defined.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#103 edit

Differences ...

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

@@ -954,7 +954,9 @@
 	ASSERT_CRED_LABEL(&new->cr_label);
 	ASSERT_VNODE_LABEL(filelabel);
 	ASSERT_VNODE_LABEL(interpvnodelabel);
-	ASSERT_VNODE_LABEL(execlabel);
+	if (execlabel != NULL) {
+		ASSERT_CRED_LABEL(execlabel);
+	}
 }
 
 static int
@@ -966,7 +968,9 @@
 	ASSERT_CRED_LABEL(&old->cr_label);
 	ASSERT_VNODE_LABEL(filelabel);
 	ASSERT_VNODE_LABEL(interpvnodelabel);
-	ASSERT_VNODE_LABEL(execlabel);
+	if (execlabel != NULL) {
+		ASSERT_CRED_LABEL(execlabel);
+	}
 
 	return (0);
 }
@@ -1457,7 +1461,9 @@
 
 	ASSERT_CRED_LABEL(&cred->cr_label);
 	ASSERT_VNODE_LABEL(label);
-	ASSERT_VNODE_LABEL(execlabel);
+	if (execlabel != NULL) {
+		ASSERT_CRED_LABEL(execlabel);
+	}
 
 	return (0);
 }