]> git.proxmox.com Git - mirror_frr.git/commitdiff
lib: remove spurious message when netns is not available
authorPhilippe Guibert <philippe.guibert@6wind.com>
Wed, 29 Aug 2018 07:27:17 +0000 (09:27 +0200)
committerPhilippe Guibert <philippe.guibert@6wind.com>
Wed, 29 Aug 2018 07:27:17 +0000 (09:27 +0200)
remove spurious message when netns is not available.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
lib/netns_linux.c

index b8eaa72c22af27710aacdd60b04cd932275e39a4..33338ac89c2c21213ebbe53f12fc513bde5fd90d 100644 (file)
@@ -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;
 }