The commit is pushed to "branch-rh7-3.10.0-229.7.2.vz7.9.x-ovz" and will appear
at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-229.7.2.vz7.9.2
------>
commit 00166426b3a4d9aa3b34e0da2286456a7431964e
Author: Stanislav Kinsburskiy <[email protected]>
Date: Tue Oct 27 19:48:24 2015 +0400
ve/nf_conntrack: expose "nf_conntrack_events*" in contaners
Series:
This series brings to vz7 all the nf_conntrack sysctl's,
which are available in vz6.
https://jira.sw.ru/browse/PSBM-40044
Signed-off-by: Stanislav Kinsburskiy <[email protected]>
Reviewed-by: Kirill Tkhai <[email protected]>
---
net/netfilter/nf_conntrack_ecache.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/netfilter/nf_conntrack_ecache.c
b/net/netfilter/nf_conntrack_ecache.c
index 1df1761..c605daa 100644
--- a/net/netfilter/nf_conntrack_ecache.c
+++ b/net/netfilter/nf_conntrack_ecache.c
@@ -199,7 +199,7 @@ static int nf_conntrack_event_init_sysctl(struct net *net)
table[1].data = &net->ct.sysctl_events_retry_timeout;
/* Don't export sysctls to unprivileged users */
- if (net->user_ns != &init_user_ns)
+ if (nf_conntrack_hide_sysctl(net))
table[0].procname = NULL;
net->ct.event_sysctl_header =
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
