From 5915eb53861c5776cfec33ca4fcc1fd20d66dd27 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Thu, 3 Jul 2008 20:56:05 +0200 Subject: security: remove dummy module Remove the dummy module and make the "capability" module the default. Compile and boot tested. Signed-off-by: Miklos Szeredi Acked-by: Serge Hallyn Signed-off-by: James Morris --- security/Kconfig | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'security/Kconfig') diff --git a/security/Kconfig b/security/Kconfig index 49b51f96489..77def9f9f5f 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -73,17 +73,9 @@ config SECURITY_NETWORK_XFRM IPSec. If you are unsure how to answer this question, answer N. -config SECURITY_CAPABILITIES - bool "Default Linux Capabilities" - depends on SECURITY - default y - 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 + depends on SECURITY && EXPERIMENTAL default n help This enables filesystem capabilities, allowing you to give -- cgit v1.2.3-70-g09d2 From 93cbace7a058bce7f99319ef6ceff4b78cf45051 Mon Sep 17 00:00:00 2001 From: Miklos Szeredi Date: Thu, 10 Jul 2008 11:10:09 +0200 Subject: security: remove dummy module fix Fix small oversight in "security: remove dummy module": CONFIG_SECURITY_FILE_CAPABILITIES doesn't depend on CONFIG_SECURITY Signed-off-by: Miklos Szeredi Signed-off-by: James Morris --- security/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'security/Kconfig') diff --git a/security/Kconfig b/security/Kconfig index 77def9f9f5f..62ed4717d33 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -75,7 +75,7 @@ config SECURITY_NETWORK_XFRM config SECURITY_FILE_CAPABILITIES bool "File POSIX Capabilities (EXPERIMENTAL)" - depends on SECURITY && EXPERIMENTAL + depends on EXPERIMENTAL default n help This enables filesystem capabilities, allowing you to give -- cgit v1.2.3-70-g09d2