diff options
| author | rwatson <rwatson@FreeBSD.org> | 2011-08-13 13:34:01 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2011-08-13 13:34:01 +0000 |
| commit | f40628d534f43961c48303fc92eaa89b3322ae0c (patch) | |
| tree | 2e0df105e7d6ff9eb06a4f0fd5bfa249ff74779a /sys/kern/sys_capability.c | |
| parent | 87507c16d79794a87075ee29546ee1fe65c67f61 (diff) | |
| download | FreeBSD-src-f40628d534f43961c48303fc92eaa89b3322ae0c.zip FreeBSD-src-f40628d534f43961c48303fc92eaa89b3322ae0c.tar.gz | |
Update use of the FEATURE() macro in sys_capability.c to reflect the move
to two different kernel options for capability mode vs. capabilities.
Approved by: re (bz)
Diffstat (limited to 'sys/kern/sys_capability.c')
| -rw-r--r-- | sys/kern/sys_capability.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/kern/sys_capability.c b/sys/kern/sys_capability.c index 884f2ff..0eb27f3 100644 --- a/sys/kern/sys_capability.c +++ b/sys/kern/sys_capability.c @@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$"); #ifdef CAPABILITY_MODE -FEATURE(security_capabilities, "Capsicum Capability Mode"); +FEATURE(security_capability_mode, "Capsicum Capability Mode"); /* * System call to enter capability mode for the process. @@ -134,6 +134,8 @@ cap_getmode(struct thread *td, struct cap_getmode_args *uap) #ifdef CAPABILITIES +FEATURE(security_capabilities, "Capsicum Capabilities"); + /* * struct capability describes a capability, and is hung off of its struct * file f_data field. cap_file and cap_rightss are static once hooked up, as |
