summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-02-07 16:33:13 -0800
committerEric W. Biederman <ebiederm@xmission.com>2012-09-21 03:13:21 -0700
commit2db81452931eb51cc739d6e495cf1bd4860c3c99 (patch)
tree959805577a8e8c449fc4b3c576d2f0c840090fa4 /init
parente4849737f76c8767e70dc1575f6e59fc3682b3fe (diff)
downloadlinux-stable-2db81452931eb51cc739d6e495cf1bd4860c3c99.tar.gz
linux-stable-2db81452931eb51cc739d6e495cf1bd4860c3c99.tar.bz2
linux-stable-2db81452931eb51cc739d6e495cf1bd4860c3c99.zip
userns: Convert apparmor to use kuid and kgid where appropriate
Cc: John Johansen <john.johansen@canonical.com> Acked-by: Serge Hallyn <serge.hallyn@canonical.com> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index f31599739f7f..637faf8626cc 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -964,7 +964,6 @@ config UIDGID_CONVERTED
# Security modules
depends on SECURITY_TOMOYO = n
- depends on SECURITY_APPARMOR = n
config UIDGID_STRICT_TYPE_CHECKS
bool "Require conversions between uid/gids and their internal representation"