From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 30 19:39:33 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E03E8106568F;
	Sat, 30 Jan 2010 19:39:33 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D14608FC1C;
	Sat, 30 Jan 2010 19:39:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UJdXsM088426;
	Sat, 30 Jan 2010 19:39:33 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UJdX89088424;
	Sat, 30 Jan 2010 19:39:33 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001301939.o0UJdX89088424@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 30 Jan 2010 19:39:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r203232 - projects/capabilities8/sys/fs/fdescfs
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Jan 2010 19:39:34 -0000

Author: rwatson
Date: Sat Jan 30 19:39:33 2010
New Revision: 203232
URL: http://svn.freebsd.org/changeset/base/203232

Log:
  Merge c173596 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Don't allow VOP_SETATTR() on fdescfs -- we could build up a capability
    rights mask for the operations it represents, but it actually isn't very
    coherent conceptually.  For example, you can chmod /dev/fd/X if that fd
    refers to a file, but if you stat() you don't see the file's mode.
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/sys/fs/fdescfs/fdesc_vnops.c

Modified: projects/capabilities8/sys/fs/fdescfs/fdesc_vnops.c
==============================================================================
--- projects/capabilities8/sys/fs/fdescfs/fdesc_vnops.c	Sat Jan 30 19:36:55 2010	(r203231)
+++ projects/capabilities8/sys/fs/fdescfs/fdesc_vnops.c	Sat Jan 30 19:39:33 2010	(r203232)
@@ -391,6 +391,8 @@ fdesc_getattr(ap)
 		struct ucred *a_cred;
 	} */ *ap;
 {
+
+#if 0
 	struct vnode *vp = ap->a_vp;
 	struct vattr *vap = ap->a_vap;
 
@@ -430,6 +432,9 @@ fdesc_getattr(ap)
 
 	vp->v_type = vap->va_type;
 	return (0);
+#else
+	return (EOPNOTSUPP);
+#endif
 }
 
 static int