summaryrefslogtreecommitdiffstats
path: root/security/integrity/ima/ima_audit.c
diff options
context:
space:
mode:
authorDmitry Kasatkin <dmitry.kasatkin@intel.com>2012-06-25 11:18:21 +0200
committerMimi Zohar <zohar@linux.vnet.ibm.com>2012-07-05 22:43:59 +0200
commit417c6c8ee2eb6975f357d8975af94ba5fbeaf82d (patch)
tree02af1e4363f415bfaa45c50a530cee78ecdf87b8 /security/integrity/ima/ima_audit.c
parentima: ima_initialized is set only if successful (diff)
downloadlinux-417c6c8ee2eb6975f357d8975af94ba5fbeaf82d.tar.xz
linux-417c6c8ee2eb6975f357d8975af94ba5fbeaf82d.zip
ima: audit is compiled only when enabled
IMA auditing code was compiled even when CONFIG_AUDIT was not enabled. This patch compiles auditing code only when possible and enabled. Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@intel.com> Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Diffstat (limited to 'security/integrity/ima/ima_audit.c')
-rw-r--r--security/integrity/ima/ima_audit.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/security/integrity/ima/ima_audit.c b/security/integrity/ima/ima_audit.c
index 21e96bf188df..7a57f6769e9c 100644
--- a/security/integrity/ima/ima_audit.c
+++ b/security/integrity/ima/ima_audit.c
@@ -17,8 +17,6 @@
static int ima_audit;
-#ifdef CONFIG_IMA_AUDIT
-
/* ima_audit_setup - enable informational auditing messages */
static int __init ima_audit_setup(char *str)
{
@@ -29,7 +27,6 @@ static int __init ima_audit_setup(char *str)
return 1;
}
__setup("ima_audit=", ima_audit_setup);
-#endif
void integrity_audit_msg(int audit_msgno, struct inode *inode,
const unsigned char *fname, const char *op,