From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762168AbXFZXZj (ORCPT ); Tue, 26 Jun 2007 19:25:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760388AbXFZXNE (ORCPT ); Tue, 26 Jun 2007 19:13:04 -0400 Received: from mx2.suse.de ([195.135.220.15]:53855 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760362AbXFZXM6 (ORCPT ); Tue, 26 Jun 2007 19:12:58 -0400 Message-Id: <20070626231204.852668923@suse.de> References: <20070626230756.519733902@suse.de> User-Agent: quilt/0.46-14 Date: Tue, 26 Jun 2007 16:08:37 -0700 From: jjohansen@suse.de To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org, linux-fsdevel@vger.kernel.org, John Johansen , Andreas Gruenbacher Subject: [AppArmor 41/44] Add AppArmor LSM to security/Makefile Content-Disposition: inline; filename=apparmor-intree.diff Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: John Johansen Signed-off-by: Andreas Gruenbacher --- security/Kconfig | 1 + security/Makefile | 1 + security/apparmor/Kconfig | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) --- a/security/Kconfig +++ b/security/Kconfig @@ -94,6 +94,7 @@ config SECURITY_ROOTPLUG If you are unsure how to answer this question, answer N. source security/selinux/Kconfig +source security/apparmor/Kconfig endmenu --- a/security/Makefile +++ b/security/Makefile @@ -14,5 +14,6 @@ endif obj-$(CONFIG_SECURITY) += security.o dummy.o inode.o # Must precede capability.o in order to stack properly. obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o +obj-$(CONFIG_SECURITY_APPARMOR) += commoncap.o apparmor/ obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o obj-$(CONFIG_SECURITY_ROOTPLUG) += commoncap.o root_plug.o --- a/security/apparmor/Kconfig +++ b/security/apparmor/Kconfig @@ -1,6 +1,7 @@ config SECURITY_APPARMOR tristate "AppArmor support" - depends on SECURITY!=n + depends on SECURITY + select AUDIT help This enables the AppArmor security module. Required userspace tools (if they are not included in your --