Commit d3ca0344 authored by Gao feng's avatar Gao feng Committed by Eric Paris
Browse files

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: default avatarGao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: default avatarRichard Guy Briggs <rgb@redhat.com>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent 51cc83f0

kernel/audit.c

+2 −11
Original line number Diff line number Diff line
@@ -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;

}