From owner-p4-projects@FreeBSD.ORG  Sun Jul 18 15:02:32 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A32381065687; Sun, 18 Jul 2010 15:02:32 +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 67D341065680
	for <perforce@freebsd.org>; Sun, 18 Jul 2010 15:02:32 +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 545CD8FC20
	for <perforce@freebsd.org>; Sun, 18 Jul 2010 15:02:32 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o6IF2Wrw063394
	for <perforce@freebsd.org>; Sun, 18 Jul 2010 15:02:32 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o6IF2WKi063392
	for perforce@freebsd.org; Sun, 18 Jul 2010 15:02:32 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 18 Jul 2010 15:02:32 GMT
Message-Id: <201007181502.o6IF2WKi063392@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181139 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Sun, 18 Jul 2010 15:02:32 -0000

http://p4web.freebsd.org/@@181139?ac=10

Change 181139 by rwatson@rwatson_vimage_client on 2010/07/18 15:02:01

	Minor capability-related style(9) tweaks to openat(2).

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#32 edit

Differences ...

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

@@ -1117,8 +1117,10 @@
 		flags = FFLAGS(flags);
 
 #ifdef CAPABILITIES
-	if (flags & FREAD)	baserights |= CAP_READ;
-	if (flags & FWRITE)	baserights |= CAP_WRITE;
+	if (flags & FREAD)
+		baserights |= CAP_READ;
+	if (flags & FWRITE)
+		baserights |= CAP_WRITE;
 #endif
 
 	/*
@@ -1134,7 +1136,7 @@
 	fp->f_flag = flags & FMASK;
 	cmode = ((mode &~ fdp->fd_cmask) & ALLPERMS) &~ S_ISTXT;
 	NDINIT_ATRIGHTS(&nd, LOOKUP, FOLLOW | AUDITVNODE1 | MPSAFE, pathseg,
-	              path, fd, baserights, td);
+	    path, fd, baserights, td);
 	td->td_dupfd = -1;		/* XXX check for fdopen */
 	error = vn_open(&nd, &flags, cmode, fp);
 	if (error) {
@@ -1227,7 +1229,7 @@
 success:
 #ifdef CAPABILITIES
 	if (nd.ni_baserights != -1) {
-		/* wrap the result in a capability */
+		/* Wrap the result in a capability. */
 		struct file *cap;
 
 		error = kern_capwrap(td, fp, nd.ni_baserights, &cap, &indx);