From owner-p4-projects@FreeBSD.ORG  Mon Feb  4 18:15:08 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4746D16A46C; Mon,  4 Feb 2008 18:15:08 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0CD5D16A469
	for <perforce@freebsd.org>; Mon,  4 Feb 2008 18:15:08 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EDD5C13C4D5
	for <perforce@freebsd.org>; Mon,  4 Feb 2008 18:15:07 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m14IF7lg014890
	for <perforce@freebsd.org>; Mon, 4 Feb 2008 18:15:07 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m14IF72E014887
	for perforce@freebsd.org; Mon, 4 Feb 2008 18:15:07 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 4 Feb 2008 18:15:07 GMT
Message-Id: <200802041815.m14IF72E014887@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>
Cc: 
Subject: PERFORCE change 134795 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, 04 Feb 2008 18:15:08 -0000

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

Change 134795 by rwatson@rwatson_freebsd_capabilities on 2008/02/04 18:14:44

	Remove OBE capability tests, add a couple more combinations to
	try.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#2 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#1 $");
+__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/tools/regression/security/cap_test/cap_test_capabilities.c#2 $");
 
 #include <sys/types.h>
 #include <sys/capability.h>
@@ -307,6 +307,8 @@
 	try_file_ops(fd, CAP_READ | CAP_SEEK);
 	try_file_ops(fd, CAP_WRITE);
 	try_file_ops(fd, CAP_WRITE | CAP_SEEK);
+	try_file_ops(fd, CAP_READ | CAP_WRITE);
+	try_file_ops(fd, CAP_READ | CAP_WRITE | CAP_SEEK);
 	try_file_ops(fd, CAP_SEEK);
 	try_file_ops(fd, CAP_FCHFLAGS);
 	try_file_ops(fd, CAP_IOCTL);
@@ -325,17 +327,6 @@
 	try_file_ops(fd, CAP_FSTATFS);
 	try_file_ops(fd, CAP_FPATHCONF);
 	try_file_ops(fd, CAP_FUTIMES);
-	try_file_ops(fd, CAP_AIO);
-	try_file_ops(fd, CAP_AIO | CAP_FSYNC);
-	try_file_ops(fd, CAP_AIO | CAP_FSYNC | CAP_READ);
-	try_file_ops(fd, CAP_AIO | CAP_FSYNC | CAP_WRITE);
-	try_file_ops(fd, CAP_AIO | CAP_FSYNC | CAP_READ | CAP_WRITE);
-	try_file_ops(fd, CAP_AIO | CAP_READ);
-	try_file_ops(fd, CAP_AIO | CAP_READ | CAP_WRITE);
-	try_file_ops(fd, CAP_AIO | CAP_WRITE);
-
-	try_file_ops(fd, CAP_FCHDIR);
-	try_file_ops(fd, CAP_GETDIRENTRIES);
 	try_file_ops(fd, CAP_ACL_GET);
 	try_file_ops(fd, CAP_ACL_SET);
 	try_file_ops(fd, CAP_ACL_DELETE);