From owner-svn-src-projects@FreeBSD.ORG  Sun Jan 31 13:01:03 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 381CA106566C;
	Sun, 31 Jan 2010 13:01:03 +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 1E96A8FC12;
	Sun, 31 Jan 2010 13:01:03 +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 o0VD13JM030806;
	Sun, 31 Jan 2010 13:01:03 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0VD12C4030804;
	Sun, 31 Jan 2010 13:01:03 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001311301.o0VD12C4030804@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 31 Jan 2010 13:01:02 +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: r203284 - 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: Sun, 31 Jan 2010 13:01:03 -0000

Author: rwatson
Date: Sun Jan 31 13:01:02 2010
New Revision: 203284
URL: http://svn.freebsd.org/changeset/base/203284

Log:
  Merge c174017 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Disable fdesc_setattr, not fdesc_getattr.
  
  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	Sun Jan 31 12:32:57 2010	(r203283)
+++ projects/capabilities8/sys/fs/fdescfs/fdesc_vnops.c	Sun Jan 31 13:01:02 2010	(r203284)
@@ -392,7 +392,6 @@ fdesc_getattr(ap)
 	} */ *ap;
 {
 
-#if 0
 	struct vnode *vp = ap->a_vp;
 	struct vattr *vap = ap->a_vap;
 
@@ -432,9 +431,6 @@ fdesc_getattr(ap)
 
 	vp->v_type = vap->va_type;
 	return (0);
-#else
-	return (EOPNOTSUPP);
-#endif
 }
 
 static int
@@ -445,6 +441,7 @@ fdesc_setattr(ap)
 		struct ucred *a_cred;
 	} */ *ap;
 {
+#if 0
 	struct vattr *vap = ap->a_vap;
 	struct vnode *vp;
 	struct mount *mp;
@@ -488,6 +485,9 @@ fdesc_setattr(ap)
 	}
 	fdrop(fp, td);
 	return (error);
+#else
+	return (EOPNOTSUPP);
+#endif
 }
 
 #define UIO_MX 16