From 5eec356062fa7071ee5c376a45ce1e85b67a8148 Mon Sep 17 00:00:00 2001 From: Kentaro Takeda Date: Thu, 5 Feb 2009 17:18:17 +0900 Subject: [PATCH] --- yaml --- r: 132616 b: refs/heads/master c: 00d7d6f840ddc947237307e022de5e75ded4105f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/Kconfig | 1 + trunk/security/Makefile | 2 ++ trunk/security/tomoyo/Kconfig | 11 +++++++++++ trunk/security/tomoyo/Makefile | 1 + 5 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 trunk/security/tomoyo/Kconfig create mode 100644 trunk/security/tomoyo/Makefile diff --git a/[refs] b/[refs] index b14f023cb5ef..66fb85180cab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7433243770c77979c396b4c7449a10e9b3521db +refs/heads/master: 00d7d6f840ddc947237307e022de5e75ded4105f diff --git a/trunk/security/Kconfig b/trunk/security/Kconfig index bf129f87de7e..bb244774e9d7 100644 --- a/trunk/security/Kconfig +++ b/trunk/security/Kconfig @@ -135,6 +135,7 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR source security/selinux/Kconfig source security/smack/Kconfig +source security/tomoyo/Kconfig source security/integrity/ima/Kconfig diff --git a/trunk/security/Makefile b/trunk/security/Makefile index 595536cbffb2..35f50c585e2b 100644 --- a/trunk/security/Makefile +++ b/trunk/security/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_KEYS) += keys/ subdir-$(CONFIG_SECURITY_SELINUX) += selinux subdir-$(CONFIG_SECURITY_SMACK) += smack +subdir-$(CONFIG_SECURITY_TOMOYO) += tomoyo # always enable default capabilities obj-y += commoncap.o @@ -17,6 +18,7 @@ obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o +obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o # Object integrity file lists subdir-$(CONFIG_IMA) += integrity/ima diff --git a/trunk/security/tomoyo/Kconfig b/trunk/security/tomoyo/Kconfig new file mode 100644 index 000000000000..c8f385793235 --- /dev/null +++ b/trunk/security/tomoyo/Kconfig @@ -0,0 +1,11 @@ +config SECURITY_TOMOYO + bool "TOMOYO Linux Support" + depends on SECURITY + select SECURITYFS + select SECURITY_PATH + default n + help + This selects TOMOYO Linux, pathname-based access control. + Required userspace tools and further information may be + found at . + If you are unsure how to answer this question, answer N. diff --git a/trunk/security/tomoyo/Makefile b/trunk/security/tomoyo/Makefile new file mode 100644 index 000000000000..10ccd686b290 --- /dev/null +++ b/trunk/security/tomoyo/Makefile @@ -0,0 +1 @@ +obj-y = common.o realpath.o tomoyo.o domain.o file.o