diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-05-24 19:58:08 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-08-15 00:55:20 -0400 |
commit | d06ca9564350184a19b5aae9ac150f1b1306de29 (patch) | |
tree | a6f5e39232911fe0582690f223390997a84f0b86 /init | |
parent | c336d148adc4181f31741ae066df41429be64b67 (diff) |
userns: Teach inet_diag to work with user namespaces
Compute the user namespace of the socket that we are replying to
and translate the kuids of reported sockets into that user namespace.
Cc: Andrew Vagin <avagin@openvz.org>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Pavel Emelyanov <xemul@parallels.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/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 8447e0ca4186..07435e0c3a4b 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -950,7 +950,6 @@ config UIDGID_CONVERTED | |||
950 | depends on NETFILTER_NETLINK_LOG = n | 950 | depends on NETFILTER_NETLINK_LOG = n |
951 | depends on AF_RXRPC = n | 951 | depends on AF_RXRPC = n |
952 | depends on NET_KEY = n | 952 | depends on NET_KEY = n |
953 | depends on INET_DIAG = n | ||
954 | depends on DNS_RESOLVER = n | 953 | depends on DNS_RESOLVER = n |
955 | 954 | ||
956 | # Filesystems | 955 | # Filesystems |