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/sys_capability.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/sys_capability.c')
-rw-r--r-- | sys/kern/sys_capability.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/sys_capability.c b/sys/kern/sys_capability.c index c6d9826..a19e881 100644 --- a/sys/kern/sys_capability.c +++ b/sys/kern/sys_capability.c @@ -36,7 +36,7 @@ * */ -#include "opt_capabilities.h" +#include "opt_capsicum.h" #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); #include <vm/uma.h> #include <vm/vm.h> -#ifdef CAPABILITIES +#ifdef CAPABILITY_MODE FEATURE(security_capabilities, "Capsicum Capability Mode"); @@ -99,7 +99,7 @@ cap_getmode(struct thread *td, struct cap_getmode_args *uap) return (copyout(&i, uap->modep, sizeof(i))); } -#else /* !CAPABILITIES */ +#else /* !CAPABILITY_MODE */ int cap_enter(struct thread *td, struct cap_enter_args *uap) @@ -115,4 +115,4 @@ cap_getmode(struct thread *td, struct cap_getmode_args *uap) return (ENOSYS); } -#endif /* CAPABILITIES */ +#endif /* CAPABILITY_MODE */ |