diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2011-08-13 13:34:01 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2011-08-13 13:34:01 +0000 |
| commit | 854d7b9fc8d18430c343707b243eaed949912121 (patch) | |
| tree | 2e0df105e7d6ff9eb06a4f0fd5bfa249ff74779a /sys/kern | |
| parent | 73516dbd27351f1cb86e72f5be56d1f7da9222a4 (diff) | |
| download | src-854d7b9fc8d18430c343707b243eaed949912121.tar.gz src-854d7b9fc8d18430c343707b243eaed949912121.zip | |
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)
Notes
Notes:
svn path=/head/; revision=224840
Diffstat (limited to 'sys/kern')
| -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 884f2ffb5d77..0eb27f3d9209 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 |