Author: netchild
Date: Fri Mar 4 09:03:54 2011
New Revision: 219258
URL: http://svn.freebsd.org/changeset/base/219258
Log:
- Add a FEATURE for capsicum (security_capabilities).
- Rename mac FEATURE to security_mac.
Discussed with: rwatson
Modified:
head/sys/kern/sys_capability.c
head/sys/security/mac/mac_syscalls.c
Modified: head/sys/kern/sys_capability.c
==============================================================================
--- head/sys/kern/sys_capability.c Fri Mar 4 07:01:45 2011
(r219257)
+++ head/sys/kern/sys_capability.c Fri Mar 4 09:03:54 2011
(r219258)
@@ -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
Modified: head/sys/security/mac/mac_syscalls.c
==============================================================================
--- head/sys/security/mac/mac_syscalls.c Fri Mar 4 07:01:45 2011
(r219257)
+++ head/sys/security/mac/mac_syscalls.c Fri Mar 4 09:03:54 2011
(r219258)
@@ -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)
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
