diff options
| author | Alexander Leidinger <netchild@FreeBSD.org> | 2011-03-04 09:03:54 +0000 |
|---|---|---|
| committer | Alexander Leidinger <netchild@FreeBSD.org> | 2011-03-04 09:03:54 +0000 |
| commit | d783bbd2d2510ea60941e6032b303095f43c2fbd (patch) | |
| tree | faedac0fef3fe158b705e39c344a469ff8f3637e /sys | |
| parent | f1168f9929e84651687cdbda467929e301d2a3e8 (diff) | |
| download | src-d783bbd2d2510ea60941e6032b303095f43c2fbd.tar.gz src-d783bbd2d2510ea60941e6032b303095f43c2fbd.zip | |
- Add a FEATURE for capsicum (security_capabilities).
- Rename mac FEATURE to security_mac.
Discussed with: rwatson
Notes
Notes:
svn path=/head/; revision=219258
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/sys_capability.c | 2 | ||||
| -rw-r--r-- | sys/security/mac/mac_syscalls.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/kern/sys_capability.c b/sys/kern/sys_capability.c index e4d721a6350c..89dc923d9b0b 100644 --- a/sys/kern/sys_capability.c +++ b/sys/kern/sys_capability.c @@ -61,6 +61,8 @@ __FBSDID("$FreeBSD$"); #ifdef CAPABILITIES +FEATURE(security_capabilities, "Capsicum Capability Mode"); + /* * We don't currently have any MIB entries for sysctls, but we do expose * security.capabilities so that it's easy to tell if options CAPABILITIES is diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index 6376c1b4d350..aea088582b31 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$"); #ifdef MAC -FEATURE(mac, "Mandatory Access Control Framework support"); +FEATURE(security_mac, "Mandatory Access Control Framework support"); int __mac_get_pid(struct thread *td, struct __mac_get_pid_args *uap) |