diff options
| author | Jonathan Anderson <jonathan@FreeBSD.org> | 2011-06-29 13:03:05 +0000 |
|---|---|---|
| committer | Jonathan Anderson <jonathan@FreeBSD.org> | 2011-06-29 13:03:05 +0000 |
| commit | 24c1c3bf7190674e2991c227a0b7ddb85525e607 (patch) | |
| tree | 371ec907aac5a99e5f3da86def673b401f58c8da /sys/amd64 | |
| parent | 2bddeb853874b218a34215eb829a2f6a541d7fa9 (diff) | |
| download | src-24c1c3bf7190674e2991c227a0b7ddb85525e607.tar.gz src-24c1c3bf7190674e2991c227a0b7ddb85525e607.zip | |
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
Notes
Notes:
svn path=/head/; revision=223668
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/sys_machdep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c index fa895f38d4de..beb248c3b00a 100644 --- a/sys/amd64/amd64/sys_machdep.c +++ b/sys/amd64/amd64/sys_machdep.c @@ -33,7 +33,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_capabilities.h" +#include "opt_capsicum.h" #include <sys/param.h> #include <sys/systm.h> @@ -180,7 +180,7 @@ sysarch(td, uap) uint64_t a64base; struct i386_ioperm_args iargs; -#ifdef CAPABILITIES +#ifdef CAPABILITY_MODE /* * Whitelist of operations which are safe enough for capability mode. */ |