---

yaml --- r: 19987 b: refs/heads/master c: 99f6d61 h: refs/heads/master i: 19985: cb71c11 19983: 9d946c5 v: v3
git-mirror · Feb 8, 2006 · 4a934e6 · 4a934e6
1 parent b52580d
commit 4a934e6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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) };