Skip to content

L
lxc
Unverified Commit 60c20c6e by Stéphane Graber Committed by GitHub
Options

Merge pull request #2945 from brauner/2019-04-19/netns_getifaddrs_adapt_to_kernel_changes

netns_getifaddrs: adapt to kernel changes
parents e12b27e5 c8ca5a43
Showing with 3 additions and 3 deletions
src/include/netns_ifaddrs.c
...@@ -468,7 +468,7 @@ static int __rtnl_enumerate(int link_af, int addr_af, __s32 netns_id, ...@@ -468,7 +468,7 @@ static int __rtnl_enumerate(int link_af, int addr_af, __s32 netns_id,
if (fd < 0) if (fd < 0)
return -1; return -1;
r = setsockopt(fd, SOL_NETLINK, NETLINK_DUMP_STRICT_CHK, &(int){1}, r = setsockopt(fd, SOL_NETLINK, NETLINK_GET_STRICT_CHK, &(int){1},
sizeof(int)); sizeof(int));
if (r < 0 && netns_id >= 0) { if (r < 0 && netns_id >= 0) {
close(fd); close(fd);
......
src/lxc/macro.h
...@@ -240,8 +240,8 @@ extern int __build_bug_on_failed; ...@@ -240,8 +240,8 @@ extern int __build_bug_on_failed;
#define prctl_arg(x) ((unsigned long)x) #define prctl_arg(x) ((unsigned long)x)
/* networking */ /* networking */
#ifndef NETLINK_DUMP_STRICT_CHK #ifndef NETLINK_GET_STRICT_CHK
#define NETLINK_DUMP_STRICT_CHK 12 #define NETLINK_GET_STRICT_CHK 12
#endif #endif
#ifndef SOL_NETLINK #ifndef SOL_NETLINK
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment