aboutsummaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2013-07-11 00:03:43 -0400
committerJohn Johansen <john.johansen@canonical.com>2013-08-14 14:42:05 -0400
commitc611616cd3cb27f9605ee4954532b3fe144d951b (patch)
treedd2575444bb99ab885617461912f831616673a1c /security/apparmor
parentdfe4ac28be73833556756dca6771d4274a7f1157 (diff)
apparmor: enable users to query whether apparmor is enabled
Signed-off-by: John Johansen <john.johansen@canonical.com>
Diffstat (limited to 'security/apparmor')
-rw-r--r--security/apparmor/lsm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index 2e2a0dd4a73f..96506dfe51ec 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -742,7 +742,7 @@ module_param_named(paranoid_load, aa_g_paranoid_load, aabool,
742 742
743/* Boot time disable flag */ 743/* Boot time disable flag */
744static bool apparmor_enabled = CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE; 744static bool apparmor_enabled = CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE;
745module_param_named(enabled, apparmor_enabled, aabool, S_IRUSR); 745module_param_named(enabled, apparmor_enabled, bool, S_IRUGO);
746 746
747static int __init apparmor_enabled_setup(char *str) 747static int __init apparmor_enabled_setup(char *str)
748{ 748{