aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2012-05-25 16:37:54 -0600
committerEric W. Biederman <ebiederm@xmission.com>2012-09-13 18:28:04 -0700
commitc6089735e7243a10faad676680c6e18d50959f74 (patch)
treeb2a19e10a0a126298aaa7a145e1ee327e3e2d85e /init
parentuserns: Convert security/keys to the new userns infrastructure (diff)
downloadlinux-dev-c6089735e7243a10faad676680c6e18d50959f74.tar.xz
linux-dev-c6089735e7243a10faad676680c6e18d50959f74.zip
userns: net: Call key_alloc with GLOBAL_ROOT_UID, GLOBAL_ROOT_GID instead of 0, 0
In net/dns_resolver/dns_key.c and net/rxrpc/ar-key.c make them work with user namespaces enabled where key_alloc takes kuids and kgids. Pass GLOBAL_ROOT_UID and GLOBAL_ROOT_GID instead of bare 0's. Cc: Sage Weil <sage@inktank.com> Cc: ceph-devel@vger.kernel.org Cc: David Howells <dhowells@redhat.com> Cc: David Miller <davem@davemloft.net> Cc: linux-afs@lists.infradead.org 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/Kconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 8dce71122709..fd8696b1a81e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -938,8 +938,6 @@ config UIDGID_CONVERTED
# Networking
depends on NET_9P = n
- depends on AF_RXRPC = n
- depends on DNS_RESOLVER = n
# Filesystems
depends on USB_GADGETFS = n