From 813fbedba464d3a32bbaa5d4051997c5b3a80626 Mon Sep 17 00:00:00 2001 From: Bart vdr. Meulen Date: Fri, 16 Mar 2012 08:45:22 +0100 Subject: [PATCH] accessfs: integrate with the LSM system Since .v2.6.37-rc1 security models that register with LSM must be know compile time (the default one) or set at boottime with the security= parameter. Add Kconfig option so that the accessfs user capabilities module can be set as default compile time. Signed-off-by: Bart vdr. Meulen --- security/Kconfig | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/security/Kconfig b/security/Kconfig index e0f08b5..9f94c2a 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -194,6 +194,7 @@ choice default DEFAULT_SECURITY_SMACK if SECURITY_SMACK default DEFAULT_SECURITY_TOMOYO if SECURITY_TOMOYO default DEFAULT_SECURITY_APPARMOR if SECURITY_APPARMOR + default DEFAULT_SECURITY_ACCESSFS_USER_CAPABILITIES if ACCESSFS_USER_CAPABILITIES default DEFAULT_SECURITY_DAC help @@ -215,6 +216,9 @@ choice config DEFAULT_SECURITY_DAC bool "Unix Discretionary Access Controls" + config DEFAULT_SECURITY_ACCESSFS_USER_CAPABILITIES + bool "User permission based capabilities" if ACCESSFS_USER_CAPABILITIES=y + endchoice config DEFAULT_SECURITY @@ -223,6 +227,7 @@ config DEFAULT_SECURITY default "smack" if DEFAULT_SECURITY_SMACK default "tomoyo" if DEFAULT_SECURITY_TOMOYO default "apparmor" if DEFAULT_SECURITY_APPARMOR + default "usercaps" if DEFAULT_SECURITY_ACCESSFS_USER_CAPABILITIES default "" if DEFAULT_SECURITY_DAC endmenu -- 1.7.0.4