From 4a934e625f1eae42bcd09e624c52efde71bb706f Mon Sep 17 00:00:00 2001 From: Stephen Smalley Date: Tue, 7 Feb 2006 12:58:51 -0800 Subject: [PATCH] --- yaml --- r: 19987 b: refs/heads/master c: 99f6d61bda82d09b2d94414d413d39f66a0b7da2 h: refs/heads/master i: 19985: cb71c11da74a975a751fcf1b8c251886bb6c6180 19983: 9d946c50bd402676c203147f896d45d94416a87e v: v3 --- [refs] | 2 +- trunk/init/Kconfig | 1 - trunk/security/selinux/Kconfig | 2 +- trunk/security/selinux/avc.c | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9d24ffcb98bc..1ed40af604b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46cd2f32baf181b74b16cceb123bab6fe1f61f85 +refs/heads/master: 99f6d61bda82d09b2d94414d413d39f66a0b7da2 diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 8b7abae87bf9..38416a199def 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -169,7 +169,6 @@ config SYSCTL config AUDIT bool "Auditing support" depends on NET - default y if SECURITY_SELINUX help Enable auditing infrastructure that can be used with another kernel subsystem, such as SELinux (which requires this for diff --git a/trunk/security/selinux/Kconfig b/trunk/security/selinux/Kconfig index 502f78f13f5f..f636f53ca544 100644 --- a/trunk/security/selinux/Kconfig +++ b/trunk/security/selinux/Kconfig @@ -1,6 +1,6 @@ config SECURITY_SELINUX bool "NSA SELinux Support" - depends on SECURITY_NETWORK && NET && INET + depends on SECURITY_NETWORK && AUDIT && NET && INET default n help This selects NSA Security-Enhanced Linux (SELinux). diff --git a/trunk/security/selinux/avc.c b/trunk/security/selinux/avc.c index 53d6c7bbf564..ac5d69bb3377 100644 --- a/trunk/security/selinux/avc.c +++ b/trunk/security/selinux/avc.c @@ -43,13 +43,11 @@ static const struct av_perm_to_string #undef S_ }; -#ifdef CONFIG_AUDIT static const char *class_to_string[] = { #define S_(s) s, #include "class_to_string.h" #undef S_ }; -#endif #define TB_(s) static const char * s [] = { #define TE_(s) };