diff options
| author | jonathan <jonathan@FreeBSD.org> | 2011-06-29 13:03:05 +0000 |
|---|---|---|
| committer | jonathan <jonathan@FreeBSD.org> | 2011-06-29 13:03:05 +0000 |
| commit | 624e7334676946983cce00d4d4d517038a630635 (patch) | |
| tree | 371ec907aac5a99e5f3da86def673b401f58c8da /sys/kern/subr_trap.c | |
| parent | 385c8843b33e10d6ea1f996fb4be1f65994984fb (diff) | |
| download | FreeBSD-src-624e7334676946983cce00d4d4d517038a630635.zip FreeBSD-src-624e7334676946983cce00d4d4d517038a630635.tar.gz | |
We may split today's CAPABILITIES into CAPABILITY_MODE (which has
to do with global namespaces) and CAPABILITIES (which has to do with
constraining file descriptors). Just in case, and because it's a better
name anyway, let's move CAPABILITIES out of the way.
Also, change opt_capabilities.h to opt_capsicum.h; for now, this will
only hold CAPABILITY_MODE, but it will probably also hold the new
CAPABILITIES (implying constrained file descriptors) in the future.
Approved by: rwatson
Sponsored by: Google UK Ltd
Diffstat (limited to 'sys/kern/subr_trap.c')
| -rw-r--r-- | sys/kern/subr_trap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 0113d7b..3527ed1 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -44,7 +44,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_capabilities.h" +#include "opt_capsicum.h" #include "opt_ktrace.h" #include "opt_kdtrace.h" #include "opt_sched.h" @@ -313,7 +313,7 @@ syscallenter(struct thread *td, struct syscall_args *sa) goto retval; } -#ifdef CAPABILITIES +#ifdef CAPABILITY_MODE /* * In capability mode, we only allow access to system calls * flagged with SYF_CAPENABLED. |
