From d783bbd2d2510ea60941e6032b303095f43c2fbd Mon Sep 17 00:00:00 2001
From: Alexander Leidinger <netchild@FreeBSD.org>
Date: Fri, 4 Mar 2011 09:03:54 +0000
Subject: [PATCH] - Add a FEATURE for capsicum (security_capabilities). -
Rename mac FEATURE to security_mac.
Discussed with: rwatson
---
sys/kern/sys_capability.c | 2 ++
sys/security/mac/mac_syscalls.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
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)