PERFORCE change 134786 for review

[Robert Watson]

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

Change 134786 by rwatson at rwatson_freebsd_capabilities on 2008/02/04 16:30:04

	More include updates and one CAP_FCHDIR gone update.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_file.c#3 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_ioctl.c#3 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/mfi/mfi_linux.c#3 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/dev/snp/snp.c#3 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/fs/portalfs/portal_vfsops.c#3 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/gnu/fs/xfs/xfs_dfrag.c#3 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_machdep.c#3 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_mqueue.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_file.c#3 (text+ko) ====

@@ -34,6 +34,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/capability.h>
 #include <sys/conf.h>
 #include <sys/dirent.h>
 #include <sys/fcntl.h>
@@ -214,9 +215,10 @@
 	} else {
 		/*
 		 * XXXRW: Not ideal, possibly fixed with native freebsd _at
-		 * support?
+		 * support?  Do we even allow _at() variations in capability
+		 * mode?
 		 */
-	   	error = fget(td, dirfd, CAP_FCHDIR, &fp);
+	   	error = fget(td, dirfd, 0, &fp);
 		if (error)
 		   	return (error);
 		dvp = fp->f_vnode;

==== //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_ioctl.c#3 (text+ko) ====

@@ -32,6 +32,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
+#include <sys/capability.h>
 #include <sys/cdio.h>
 #include <sys/dvdio.h>
 #include <sys/conf.h>

==== //depot/projects/trustedbsd/capabilities/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 (text+ko) ====

@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/capability.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>

==== //depot/projects/trustedbsd/capabilities/src/sys/dev/mfi/mfi_linux.c#3 (text) ====

@@ -29,6 +29,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/capability.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/module.h>

==== //depot/projects/trustedbsd/capabilities/src/sys/dev/snp/snp.c#3 (text+ko) ====

@@ -19,6 +19,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/capability.h>
 #include <sys/fcntl.h>
 #include <sys/filio.h>
 #include <sys/malloc.h>

==== //depot/projects/trustedbsd/capabilities/src/sys/fs/portalfs/portal_vfsops.c#3 (text+ko) ====

@@ -40,6 +40,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/capability.h>
 #include <sys/domain.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>

==== //depot/projects/trustedbsd/capabilities/src/sys/gnu/fs/xfs/xfs_dfrag.c#3 (text+ko) ====

@@ -46,6 +46,7 @@
 #include "xfs_mac.h"
 #include "xfs_rw.h"
 
+#include <sys/capability.h>
 #include <sys/file.h>
 
 /*

==== //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_machdep.c#3 (text+ko) ====

@@ -31,6 +31,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/capability.h>
 #include <sys/file.h>
 #include <sys/fcntl.h>
 #include <sys/imgact.h>

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_mqueue.c#3 (text+ko) ====

@@ -50,6 +50,7 @@
 #include <sys/systm.h>
 #include <sys/limits.h>
 #include <sys/buf.h>
+#include <sys/capability.h>
 #include <sys/dirent.h>
 #include <sys/event.h>
 #include <sys/eventhandler.h>