matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

Merge pull request #2010 from donaldsharp/ns_fixes

Browse source 
lib: Namespaces should only complain about failure if we have it
This commit is contained in:
Philippe Guibert 2018-04-03 17:14:42 +02:00 committed by GitHub
parent 4eb81e58d9 290d80a720
commit 53397a95e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/netns_linux.c
View file

@ -412,9 +412,12 @@ void ns_init(void)
return; return;
errno = 0; errno = 0;
#ifdef HAVE_NETNS #ifdef HAVE_NETNS
if (have_netns_enabled < 0) if (have_netns_enabled < 0) {
ns_default_ns_fd = open(NS_DEFAULT_NAME, O_RDONLY); 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; ns_default_ns_fd = -1;
default_ns = NULL; default_ns = NULL;
} }
@ -422,9 +425,6 @@ void ns_init(void)
ns_default_ns_fd = -1; ns_default_ns_fd = -1;
default_ns = NULL; default_ns = NULL;
#endif /* HAVE_NETNS */ #endif /* HAVE_NETNS */
if (ns_default_ns_fd == -1)
zlog_err("NS initialisation failure (%s)",
safe_strerror(errno));
ns_current_ns_fd = -1; ns_current_ns_fd = -1;
ns_initialised = 1; ns_initialised = 1;
} }