From owner-p4-projects@FreeBSD.ORG  Mon Feb  4 16:30:12 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BB6DF16A46D; Mon,  4 Feb 2008 16:30:12 +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 8082F16A421
	for <perforce@freebsd.org>; Mon,  4 Feb 2008 16:30:12 +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 6CAC413C4D1
	for <perforce@freebsd.org>; Mon,  4 Feb 2008 16:30:12 +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 m14GUCMI096352
	for <perforce@freebsd.org>; Mon, 4 Feb 2008 16:30:12 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 m14GUCjI096349
	for perforce@freebsd.org; Mon, 4 Feb 2008 16:30:12 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 4 Feb 2008 16:30:12 GMT
Message-Id: <200802041630.m14GUCjI096349@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 134786 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 16:30:13 -0000

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

Change 134786 by rwatson@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>