From owner-p4-projects@FreeBSD.ORG  Sat Jun  6 21:50:51 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 60A7E1065670; Sat,  6 Jun 2009 21:50:51 +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 20C0B106564A
	for <perforce@freebsd.org>; Sat,  6 Jun 2009 21:50:51 +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 0D5E48FC12
	for <perforce@freebsd.org>; Sat,  6 Jun 2009 21:50:51 +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.3/8.14.3) with ESMTP id n56Loo0G077397
	for <perforce@freebsd.org>; Sat, 6 Jun 2009 21:50:50 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 n56LooXR077395
	for perforce@freebsd.org; Sat, 6 Jun 2009 21:50:50 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 6 Jun 2009 21:50:50 GMT
Message-Id: <200906062150.n56LooXR077395@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 163671 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: Sat, 06 Jun 2009 21:50:52 -0000

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

Change 163671 by rwatson@rwatson_freebsd_capabilities on 2009/06/06 21:50:07

	Update cap_fextract_mmap() for the !CAPABILITIES case following
	work to properly implement capability interpretation for mmap(2).

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#23 edit

Differences ...

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

@@ -50,7 +50,7 @@
 #include "opt_capabilities.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#22 $");
+__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#23 $");
 
 #include <sys/param.h>
 #include <sys/capability.h>
@@ -481,7 +481,8 @@
 }
 
 int
-cap_fextract_mmap(struct file *fp_cap, u_char *maxprotp, struct file **fpp)
+cap_fextract_mmap(struct file *fp_cap, cap_rights_t rights, u_char *maxprotp,
+    struct file **fpp)
 {
 
 	KASSERT(fp_cap->f_type != DTYPE_CAPABILITY,
@@ -489,7 +490,7 @@
 
 	*fpp = fp_cap;
 	*maxprotp = VM_PROT_ALL;
-	return (0:
+	return (0);
 }
 
 int