diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-03-31 15:08:14 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-03-31 15:08:14 -0400 |
| commit | 290d80a7208f20f53f8cd6a5c9c516b4aba7968e (patch) | |
| tree | 7e54b696d18103d1eaf1738512ac1b21ab128d2b /lib/netns_linux.c | |
| parent | 5f047032e7ebe97ba98229cb979cf940689d869a (diff) | |
lib: Namespaces should only complain about failure if we have it
Do not complain about failure to create a namespace if we
do not have any such thing going on.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'lib/netns_linux.c')
| -rw-r--r-- | lib/netns_linux.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/netns_linux.c b/lib/netns_linux.c index 01616be711..3d61cecc03 100644 --- a/lib/netns_linux.c +++ b/lib/netns_linux.c @@ -412,9 +412,12 @@ void ns_init(void) return; errno = 0; #ifdef HAVE_NETNS - if (have_netns_enabled < 0) + if (have_netns_enabled < 0) { ns_default_ns_fd = open(NS_DEFAULT_NAME, O_RDONLY); - else { + if (ns_default_ns_fd == -1) + zlog_err("NS initialization failure %d(%s)", + errno, safe_strerror(errno)); + } else { ns_default_ns_fd = -1; default_ns = NULL; } @@ -422,9 +425,6 @@ void ns_init(void) ns_default_ns_fd = -1; default_ns = NULL; #endif /* HAVE_NETNS */ - if (ns_default_ns_fd == -1) - zlog_err("NS initialisation failure (%s)", - safe_strerror(errno)); ns_current_ns_fd = -1; ns_initialised = 1; } |