Date: Mon, 16 Jul 2007 06:57:15 GMT From: Zhouyi ZHOU <zhouzhouyi@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 123580 for review Message-ID: <200707160657.l6G6vFhR029327@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200707160657.l6G6vFhR029327>
