V4L/DVB (6480): bttv: uses input functions, should depend on INPUT

[safe/jmp/linux-2.6] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 67785df..8086e61 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
          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.
 
        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
 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
        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,18 +103,6 @@ config SECURITY_ROOTPLUG
          
          If you are unsure how to answer this question, answer N.
 
          
          If you are unsure how to answer this question, answer N.
 

-config SECURITY_SECLVL
-       tristate "BSD Secure Levels"
-       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.
-
-         If you are unsure how to answer this question, answer N.
-

 source security/selinux/Kconfig
 
 endmenu
 source security/selinux/Kconfig
 
 endmenu