From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754206AbYJTHk4 (ORCPT ); Mon, 20 Oct 2008 03:40:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752977AbYJTHhd (ORCPT ); Mon, 20 Oct 2008 03:37:33 -0400 Received: from ms1.nttdata.co.jp ([163.135.193.232]:49667 "EHLO ms1.nttdata.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752198AbYJTHhF (ORCPT ); Mon, 20 Oct 2008 03:37:05 -0400 Message-Id: <20081020073700.449955126@nttdata.co.jp> References: <20081020073423.024299308@nttdata.co.jp> User-Agent: quilt/0.45-1 Date: Mon, 20 Oct 2008 16:34:33 +0900 From: Kentaro Takeda To: Stephen Smalley , James Morris , Chris Wright Cc: "Serge E. Hallyn" , linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Toshiharu Harada , Andrew Morton , Kentaro Takeda , Tetsuo Handa Subject: [TOMOYO #11 (linux-next) 10/11] Kconfig and Makefile X-OriginalArrivalTime: 20 Oct 2008 07:37:02.0566 (UTC) FILETIME=[A49F0060:01C93286] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Kentaro Takeda Signed-off-by: Tetsuo Handa --- security/Kconfig | 1 + security/Makefile | 2 ++ security/tomoyo/Kconfig | 11 +++++++++++ security/tomoyo/Makefile | 1 + 4 files changed, 15 insertions(+) --- linux-next.orig/security/Kconfig +++ linux-next/security/Kconfig @@ -134,6 +134,7 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR source security/selinux/Kconfig source security/smack/Kconfig +source security/tomoyo/Kconfig endmenu --- linux-next.orig/security/Makefile +++ linux-next/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,3 +18,4 @@ obj-$(CONFIG_SECURITY_SELINUX) += selin 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 --- /dev/null +++ linux-next/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. --- /dev/null +++ linux-next/security/tomoyo/Makefile @@ -0,0 +1 @@ +obj-y = common.o realpath.o tomoyo.o domain.o file.o --