aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Johansen2010-07-29 16:48:08 -0500
committerJames Morris2010-08-02 00:38:34 -0500
commitf9ad1af53d5232a89a1ff1827102843999975dfa (patch)
tree2d7f4c35208b74995651fa6eb47031a37f928503 /security/Kconfig
parentc1c124e91e7c6d5a600c98f6fb5b443c403a14f4 (diff)
downloadam43-linux-kernel-f9ad1af53d5232a89a1ff1827102843999975dfa.tar.gz
am43-linux-kernel-f9ad1af53d5232a89a1ff1827102843999975dfa.tar.xz
am43-linux-kernel-f9ad1af53d5232a89a1ff1827102843999975dfa.zip
AppArmor: Enable configuring and building of the AppArmor security module
Kconfig and Makefiles to enable configuration and building of AppArmor. Signed-off-by: John Johansen <john.johansen@canonical.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/Kconfig')
-rw-r--r--security/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/security/Kconfig b/security/Kconfig
index 226b9556b25..bd72ae62349 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -140,6 +140,7 @@ config LSM_MMAP_MIN_ADDR
140source security/selinux/Kconfig 140source security/selinux/Kconfig
141source security/smack/Kconfig 141source security/smack/Kconfig
142source security/tomoyo/Kconfig 142source security/tomoyo/Kconfig
143source security/apparmor/Kconfig
143 144
144source security/integrity/ima/Kconfig 145source security/integrity/ima/Kconfig
145 146
@@ -148,6 +149,7 @@ choice
148 default DEFAULT_SECURITY_SELINUX if SECURITY_SELINUX 149 default DEFAULT_SECURITY_SELINUX if SECURITY_SELINUX
149 default DEFAULT_SECURITY_SMACK if SECURITY_SMACK 150 default DEFAULT_SECURITY_SMACK if SECURITY_SMACK
150 default DEFAULT_SECURITY_TOMOYO if SECURITY_TOMOYO 151 default DEFAULT_SECURITY_TOMOYO if SECURITY_TOMOYO
152 default DEFAULT_SECURITY_APPARMOR if SECURITY_APPARMOR
151 default DEFAULT_SECURITY_DAC 153 default DEFAULT_SECURITY_DAC
152 154
153 help 155 help
@@ -163,6 +165,9 @@ choice
163 config DEFAULT_SECURITY_TOMOYO 165 config DEFAULT_SECURITY_TOMOYO
164 bool "TOMOYO" if SECURITY_TOMOYO=y 166 bool "TOMOYO" if SECURITY_TOMOYO=y
165 167
168 config DEFAULT_SECURITY_APPARMOR
169 bool "AppArmor" if SECURITY_APPARMOR=y
170
166 config DEFAULT_SECURITY_DAC 171 config DEFAULT_SECURITY_DAC
167 bool "Unix Discretionary Access Controls" 172 bool "Unix Discretionary Access Controls"
168 173
@@ -173,6 +178,7 @@ config DEFAULT_SECURITY
173 default "selinux" if DEFAULT_SECURITY_SELINUX 178 default "selinux" if DEFAULT_SECURITY_SELINUX
174 default "smack" if DEFAULT_SECURITY_SMACK 179 default "smack" if DEFAULT_SECURITY_SMACK
175 default "tomoyo" if DEFAULT_SECURITY_TOMOYO 180 default "tomoyo" if DEFAULT_SECURITY_TOMOYO
181 default "apparmor" if DEFAULT_SECURITY_APPARMOR
176 default "" if DEFAULT_SECURITY_DAC 182 default "" if DEFAULT_SECURITY_DAC
177 183
178endmenu 184endmenu