summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorStephen Smalley <sds@tycho.nsa.gov>2006-02-07 21:58:51 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-08 01:12:33 +0100
commit99f6d61bda82d09b2d94414d413d39f66a0b7da2 (patch)
tree7e204d1b3ffa642889905aa3a86c84d98e0c0af9 /security
parent[PATCH] Fix build failure in recent pm_prepare_* changes. (diff)
downloadlinux-99f6d61bda82d09b2d94414d413d39f66a0b7da2.tar.xz
linux-99f6d61bda82d09b2d94414d413d39f66a0b7da2.zip
[PATCH] selinux: require AUDIT
Make SELinux depend on AUDIT as it requires the basic audit support to log permission denials at all. Note that AUDITSYSCALL remains optional for SELinux, although it can be useful in providing further information upon denials. Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> Acked-by: James Morris <jmorris@namei.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/Kconfig2
-rw-r--r--security/selinux/avc.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig
index 502f78f13f5f..f636f53ca544 100644
--- a/security/selinux/Kconfig
+++ b/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/security/selinux/avc.c b/security/selinux/avc.c
index 53d6c7bbf564..ac5d69bb3377 100644
--- a/security/selinux/avc.c
+++ b/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) };