diff options
| author | Christian Franke <nobody@nowhere.ws> | 2018-08-29 19:21:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 19:21:59 +0200 |
| commit | 2e7d2b93b6a6ecbc97f7e1e722c847a7f471afde (patch) | |
| tree | fdd034833c4ed9edda94d9627a5387618d416d02 /lib/netns_linux.c | |
| parent | 4ebfd799c0f4c4d24f5cdfc7f3b21659a7d491dc (diff) | |
| parent | 2ed3953cccd505c13d9f1fd17bdf7063a4fefbb7 (diff) | |
Merge pull request #2938 from pguibert6WIND/spurious_message
lib: remove spurious message when netns is not available
Diffstat (limited to 'lib/netns_linux.c')
| -rw-r--r-- | lib/netns_linux.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/netns_linux.c b/lib/netns_linux.c index b8eaa72c22..33338ac89c 100644 --- a/lib/netns_linux.c +++ b/lib/netns_linux.c @@ -468,21 +468,12 @@ void ns_init(void) if (ns_initialised == 1) return; errno = 0; -#ifdef HAVE_NETNS - if (have_netns_enabled < 0) { + if (have_netns()) ns_default_ns_fd = open(NS_DEFAULT_NAME, O_RDONLY); - if (ns_default_ns_fd == -1) - flog_err(LIB_ERR_NS, - "NS initialization failure %d(%s)", errno, - safe_strerror(errno)); - } else { + else { ns_default_ns_fd = -1; default_ns = NULL; } -#else - ns_default_ns_fd = -1; - default_ns = NULL; -#endif /* HAVE_NETNS */ ns_current_ns_fd = -1; ns_initialised = 1; } |