Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 67785df264e511c83550455240f633dc99cc3483..49fc5fcdfc724238e83b85cfd8d1fe2a9dd699ae 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -74,15 +74,25 @@ config SECURITY_NETWORK_XFRM
          If you are unsure how to answer this question, answer N.
 
 config SECURITY_CAPABILITIES
-       tristate "Default Linux Capabilities"
+       bool "Default Linux Capabilities"
        depends on SECURITY
        help
          This enables the "default" Linux capabilities functionality.
          If you are unsure how to answer this question, answer Y.
 
+config SECURITY_FILE_CAPABILITIES
+       bool "File POSIX Capabilities (EXPERIMENTAL)"
+       depends on (SECURITY=n || SECURITY_CAPABILITIES!=n) && EXPERIMENTAL
+       default n
+       help
+         This enables filesystem capabilities, allowing you to give
+         binaries a subset of root's powers without using setuid 0.
+
+         If in doubt, answer N.
+
 config SECURITY_ROOTPLUG
-       tristate "Root Plug Support"
-       depends on USB && SECURITY
+       bool "Root Plug Support"
+       depends on USB=y && SECURITY
        help
          This is a sample LSM module that should only be used as such.
          It prevents any programs running with egid == 0 if a specific
@@ -93,15 +103,11 @@ config SECURITY_ROOTPLUG
          
          If you are unsure how to answer this question, answer N.
 
-config SECURITY_SECLVL
-       tristate "BSD Secure Levels"
+config SECURITY_LOWMEM
+       tristate "Low memory watermark support"
        depends on SECURITY
-       select CRYPTO
-       select CRYPTO_SHA1
        help
-         Implements BSD Secure Levels as an LSM.  See
-         <file:Documentation/seclvl.txt> for instructions on how to use this
-         module.
+         Implements low memory watermark support.
 
          If you are unsure how to answer this question, answer N.