From owner-p4-projects@FreeBSD.ORG  Mon Jul 16 06:57:16 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0CA2A16A403; Mon, 16 Jul 2007 06:57:16 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B83CE16A402
	for <perforce@FreeBSD.org>; Mon, 16 Jul 2007 06:57:15 +0000 (UTC)
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id A7EC613C4A7
	for <perforce@FreeBSD.org>; Mon, 16 Jul 2007 06:57:15 +0000 (UTC)
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6G6vF3p029330
	for <perforce@FreeBSD.org>; Mon, 16 Jul 2007 06:57:15 GMT
	(envelope-from zhouzhouyi@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6G6vFhR029327
	for perforce@freebsd.org; Mon, 16 Jul 2007 06:57:15 GMT
	(envelope-from zhouzhouyi@FreeBSD.org)
Date: Mon, 16 Jul 2007 06:57:15 GMT
Message-Id: <200707160657.l6G6vFhR029327@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zhouzhouyi@FreeBSD.org using -f
From: Zhouyi ZHOU <zhouzhouyi@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 123580 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Mon, 16 Jul 2007 06:57:16 -0000

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

Change 123580 by zhouzhouyi@zhouzhouyi_mactest on 2007/07/16 06:57:02

	checking the effects of BLP when security.mac.mls.enabled=1

Affected files ...

.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#7 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/01.t#5 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/02.t#1 add
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_biba/mac_biba.c#2 edit
.. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_mls/mac_mls.c#2 edit

Differences ...

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#7 (text+ko) ====

@@ -43,8 +43,8 @@
 {
 	e="${1}"
 	shift
-	${mactest} $* 2>${tmp_file} 1>>${tmp_file}
-	r=`cat ${tmp_file}`
+	${mactest} $* 2>/dev/null 1>>${tmp_file}
+	r=`cat ${tmp_file}|tail -1`
 	echo "${r}" | egrep '^'${e}'$' >/dev/null 2>&1
 	if [ $? -eq 0 ] && [ ${#r} -eq ${#e} ]; then
 		echo "ok ${ntest}"

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/01.t#5 (text+ko) ====

@@ -109,5 +109,6 @@
 #cleanup:
     cd ..
     rm -fr ${n1}
+    rm ${mactest_conf}
 fi
 

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_biba/mac_biba.c#2 (text+ko) ====

@@ -793,6 +793,7 @@
 	if (strcmp(dev->si_name, "null") == 0 ||
 	    strcmp(dev->si_name, "zero") == 0 ||
 	    strcmp(dev->si_name, "random") == 0 ||
+	    strcmp(dev->si_name, "mactest") == 0 ||
 	    strncmp(dev->si_name, "fd/", strlen("fd/")) == 0)
 		biba_type = MAC_BIBA_TYPE_EQUAL;
 	else if (ptys_equal &&

==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_mls/mac_mls.c#2 (text+ko) ====

@@ -754,6 +754,7 @@
 	mac_mls = SLOT(delabel);
 	if (strcmp(dev->si_name, "null") == 0 ||
 	    strcmp(dev->si_name, "zero") == 0 ||
+	    strcmp(dev->si_name, "mactest") == 0 ||
 	    strcmp(dev->si_name, "random") == 0 ||
 	    strncmp(dev->si_name, "fd/", strlen("fd/")) == 0)
 		mls_type = MAC_MLS_TYPE_EQUAL;