fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 67785df..a6807ff 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -6,6 +6,7 @@ menu "Security options"
 
 config KEYS
        bool "Enable access key retention support"
+       depends on !VSERVER_SECURITY
        help
          This option provides support for retaining authentication tokens and
          access keys in the kernel.
@@ -93,18 +94,6 @@ config SECURITY_ROOTPLUG
          
          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