PERFORCE change 32230 for review

[Robert Watson]

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

Change 32230 by rwatson at 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);
 }