summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGao feng <gaofeng@cn.fujitsu.com>2013-10-31 07:31:01 +0100
committerEric Paris <eparis@redhat.com>2014-01-14 04:28:53 +0100
commitd3ca0344b21f04786219bf0f49647f24e4e17323 (patch)
tree45e0fea235246245c9161ef8a7da4b92ff0a9f58
parentaudit: add audit_backlog_wait_time configuration option (diff)
downloadlinux-d3ca0344b21f04786219bf0f49647f24e4e17323.tar.xz
linux-d3ca0344b21f04786219bf0f49647f24e4e17323.zip
audit: remove useless code in audit_enable
Since kernel parameter is operated before initcall, so the audit_initialized must be AUDIT_UNINITIALIZED or DISABLED in audit_enable. Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com> Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: Eric Paris <eparis@redhat.com>
-rw-r--r--kernel/audit.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index 37ba59936dc5..14324dd186dc 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1116,17 +1116,8 @@ static int __init audit_enable(char *str)
if (!audit_default)
audit_initialized = AUDIT_DISABLED;
- printk(KERN_INFO "audit: %s", audit_default ? "enabled" : "disabled");
-
- if (audit_initialized == AUDIT_INITIALIZED) {
- audit_enabled = audit_default;
- audit_ever_enabled |= !!audit_default;
- } else if (audit_initialized == AUDIT_UNINITIALIZED) {
- printk(" (after initialization)");
- } else {
- printk(" (until reboot)");
- }
- printk("\n");
+ pr_info("audit: %s\n", audit_default ?
+ "enabled (after initialization)" : "disabled (until reboot)");
return 1;
}