PERFORCE change 163671 for review

[Robert Watson]

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

Change 163671 by rwatson at 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