ChangeSet 1.842.44.4, 2002/11/25 20:10:47-08:00, greg@kroah.com

LSM: put CONFIG_SECURITY back into the Kconfig file (was lost in the merge)


diff -Nru a/security/Kconfig b/security/Kconfig
--- a/security/Kconfig	Tue Nov 26 14:02:10 2002
+++ b/security/Kconfig	Tue Nov 26 14:02:10 2002
@@ -4,9 +4,20 @@
 
 menu "Security options"
 
+config SECURITY
+	bool "Enable different security models"
+	help
+	  This allows you to choose different security modules to be
+	  configured into your kernel.
+
+	  If this option is not selected, the default Linux security
+	  model will be used.
+
+	  If you are unsure how to answer this question, answer N.
+
 config SECURITY_CAPABILITIES
-	bool
-	default y
+	tristate "Default Linux Capabilities"
+	depends on SECURITY!=n
 	help
 	  This enables the "default" Linux capabilities functionality.
 	  If you are unsure how to answer this question, answer Y.