Author: rwatson
Date: Sat Aug 13 13:34:01 2011
New Revision: 224840
URL: http://svn.freebsd.org/changeset/base/224840
Log:
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)
Modified:
head/sys/kern/sys_capability.c
Modified: head/sys/kern/sys_capability.c
==============================================================================
--- head/sys/kern/sys_capability.c Sat Aug 13 13:26:40 2011
(r224839)
+++ head/sys/kern/sys_capability.c Sat Aug 13 13:34:01 2011
(r224840)
@@ -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 ca
#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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
