From: sergeh@us.ibm.com <sergeh@us.ibm.com>
Date: Tue, 29 Jan 2008 13:04:43 +0000 (-0800)
Subject: security: compile capabilities by default
X-Git-Tag: v2.6.25-rc1~1136^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f71ea9ddf0ff110f3fcbb89a46686bfba264014c;p=linux-2.6

security: compile capabilities by default

Capabilities have long been the default when CONFIG_SECURITY=n,
and its help text suggests turning it on when CONFIG_SECURITY=y.
But it is set to default n.

Default it to y instead.

Signed-off-by: Serge Hallyn <serue@us.ibm.com>
Acked-by: Matt LaPlante <kernel1@cyberdogtech.com>
Signed-off-by: James Morris <jmorris@namei.org>
---

diff --git a/security/Kconfig b/security/Kconfig
index 8086e61058..389e151e3b 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -76,6 +76,7 @@ config SECURITY_NETWORK_XFRM
 config SECURITY_CAPABILITIES
 	bool "Default Linux Capabilities"
 	depends on SECURITY
+	default y
 	help
 	  This enables the "default" Linux capabilities functionality.
 	  If you are unsure how to answer this question, answer Y.