Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index dcf04a0..34f5934 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -35,6 +35,7 @@ config KEYS_DEBUG_PROC_KEYS
 
 config SECURITY
        bool "Enable different security models"
 
 config SECURITY
        bool "Enable different security models"

+       depends on SYSFS

        help
          This allows you to choose different security modules to be
          configured into your kernel.
        help
          This allows you to choose different security modules to be
          configured into your kernel.


@@ -53,6 +54,19 @@ config SECURITY_NETWORK
          implement socket and networking access controls.
          If you are unsure how to answer this question, answer N.
 
          implement socket and networking access controls.
          If you are unsure how to answer this question, answer N.
 

+config SECURITY_NETWORK_XFRM
+       bool "XFRM (IPSec) Networking Security Hooks"
+       depends on XFRM && SECURITY_NETWORK
+       help
+         This enables the XFRM (IPSec) networking security hooks.
+         If enabled, a security module can use these hooks to
+         implement per-packet access controls based on labels
+         derived from IPSec policy.  Non-IPSec communications are
+         designated as unlabelled, and only sockets authorized
+         to communicate unlabelled data can send without using
+         IPSec.
+         If you are unsure how to answer this question, answer N.
+

 config SECURITY_CAPABILITIES
        tristate "Default Linux Capabilities"
        depends on SECURITY
 config SECURITY_CAPABILITIES
        tristate "Default Linux Capabilities"
        depends on SECURITY