BACKPORT: 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

Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
(cherry-picked from upstream 111fe8bd65e473d5fc6a0478cf1e2c8c6a77489a)

diff --git a/security/smack/Kconfig b/security/smack/Kconfig
index 603b0878434172a32183404bd0525575b9a017e5..e69de9c642b7f03c8648457495511ca0c8bc839c 100644 (file)
--- 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.