PERFORCE change 134795 for review

[Robert Watson]

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

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