summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCasey Schaufler <casey@schaufler-ca.com>2012-11-02 11:28:11 -0700
committerHeikki Krogerus <heikki.krogerus@linux.intel.com>2013-11-11 13:51:17 +0200
commitfc69e02cedba708ed116e26f0edf535380691cb6 (patch)
treec73499e1d31a1f45cf04adfe7d92a33e7fc11d93
parentdf8354bdff705b30a32271ad1942048fa77a8ddf (diff)
downloadkernel-mfld-blackbay-fc69e02cedba708ed116e26f0edf535380691cb6.tar.gz
kernel-mfld-blackbay-fc69e02cedba708ed116e26f0edf535380691cb6.tar.bz2
kernel-mfld-blackbay-fc69e02cedba708ed116e26f0edf535380691cb6.zip
Smack: use select not depends in Kconfig
The components NETLABEL and SECURITY_NETWORK are required by Smack. Using "depends" in Kconfig hides the Smack option if the user hasn't figured out that they need to be enabled while using make menuconfig. Using select is a better choice. Because select is not recursive depends on NET and SECURITY are added. The reflects similar usage in TOMOYO and AppArmor. Targeted for git://git.gitorious.org/smack-next/kernel.git (Upstream commit id: 111fe8bd65e473d5fc6a0478cf1e2c8c6a77489a) Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
-rw-r--r--security/smack/Kconfig6
1 files changed, 5 insertions, 1 deletions
diff --git a/security/smack/Kconfig b/security/smack/Kconfig
index 603b0878434..e69de9c642b 100644
--- a/security/smack/Kconfig
+++ b/security/smack/Kconfig
@@ -1,6 +1,10 @@
config SECURITY_SMACK
bool "Simplified Mandatory Access Control Kernel Support"
- depends on NETLABEL && SECURITY_NETWORK
+ depends on NET
+ depends on INET
+ depends on SECURITY
+ select NETLABEL
+ select SECURITY_NETWORK
default n
help
This selects the Simplified Mandatory Access Control Kernel.