aboutsummaryrefslogtreecommitdiffstats
path: root/security/Makefile
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2008-07-03 20:56:05 +0200
committerJames Morris <jmorris@namei.org>2008-07-14 15:03:04 +1000
commit5915eb53861c5776cfec33ca4fcc1fd20d66dd27 (patch)
treed4895b96dfdc227a3abe2f13c093b6f53ac3aef8 /security/Makefile
parentb478a9f9889c81e88077d1495daadee64c0af541 (diff)
downloadmrst-s0i3-test-5915eb53861c5776cfec33ca4fcc1fd20d66dd27.tar.gz
mrst-s0i3-test-5915eb53861c5776cfec33ca4fcc1fd20d66dd27.tar.xz
mrst-s0i3-test-5915eb53861c5776cfec33ca4fcc1fd20d66dd27.zip
security: remove dummy module
Remove the dummy module and make the "capability" module the default. Compile and boot tested. Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Acked-by: Serge Hallyn <serue@us.ibm.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/Makefile')
-rw-r--r--security/Makefile11
1 files changed, 4 insertions, 7 deletions
diff --git a/security/Makefile b/security/Makefile
index 7ef1107a728..f65426099aa 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -6,16 +6,13 @@ obj-$(CONFIG_KEYS) += keys/
subdir-$(CONFIG_SECURITY_SELINUX) += selinux
subdir-$(CONFIG_SECURITY_SMACK) += smack
-# if we don't select a security model, use the default capabilities
-ifneq ($(CONFIG_SECURITY),y)
+# always enable default capabilities
obj-y += commoncap.o
-endif
# Object file lists
-obj-$(CONFIG_SECURITY) += security.o dummy.o inode.o
+obj-$(CONFIG_SECURITY) += security.o capability.o inode.o
# Must precede capability.o in order to stack properly.
obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o
-obj-$(CONFIG_SECURITY_SMACK) += commoncap.o smack/built-in.o
-obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o
-obj-$(CONFIG_SECURITY_ROOTPLUG) += commoncap.o root_plug.o
+obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o
+obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o
obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o