From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sat, 31 Mar 2018 19:08:14 +0000 (-0400)
Subject: lib: Namespaces should only complain about failure if we have it
X-Git-Tag: frr-5.0-dev~89^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F2010%2Fhead;p=mirror%2Ffrr.git

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>
---

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;
 }