summaryrefslogtreecommitdiff
path: root/security/Makefile
diff options
context:
space:
mode:
authorThomas Liu <tliu@redhat.com>2009-07-10 10:31:04 -0400
committerJames Morris <jmorris@namei.org>2009-07-13 07:54:48 +1000
commit8113a8d80f4c6a3dc3724b39b470f3fee9c426b6 (patch)
tree27eb775108daaff8390ad564010a9f2fbd5187a2 /security/Makefile
parent65c3f0a2d0f72d210c879e4974c2d222b7951321 (diff)
downloadlwn-8113a8d80f4c6a3dc3724b39b470f3fee9c426b6.tar.gz
lwn-8113a8d80f4c6a3dc3724b39b470f3fee9c426b6.zip
SELinux: Convert avc_audit to use lsm_audit.h
Convert avc_audit in security/selinux/avc.c to use lsm_audit.h, for better maintainability and for less code duplication. - changed selinux to use common_audit_data instead of avc_audit_data - eliminated code in avc.c and used code from lsm_audit.h instead. I have tested to make sure that the avcs look the same before and after this patch. Signed-off-by: Thomas Liu <tliu@redhat.com> Acked-by: Eric Paris <eparis@redhat.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/Makefile')
-rw-r--r--security/Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/security/Makefile b/security/Makefile
index c67557cdaa85..8dcc1fdcdc69 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -16,9 +16,7 @@ obj-$(CONFIG_SECURITYFS) += inode.o
# Must precede capability.o in order to stack properly.
obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o
obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o
-ifeq ($(CONFIG_AUDIT),y)
-obj-$(CONFIG_SECURITY_SMACK) += lsm_audit.o
-endif
+obj-$(CONFIG_AUDIT) += lsm_audit.o
obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o
obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o
obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o