Merge pull request #2932 from donaldsharp/ferr_fix

[mirror_frr.git] / ldpd / ldpd.c

diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
index b51ff82cea5a9b035fa182dddcc4b64009d44ad0..935e959596587dbed50e960ac28f62b02ec9d66f 100644 (file)
--- a/ldpd/ldpd.c
+++ b/ldpd/ldpd.c
@@ -42,6 +42,7 @@
 #include "filter.h"
 #include "qobj.h"
 #include "libfrr.h"
+#include "lib_errors.h"
 
 static void             ldpd_shutdown(void);
 static pid_t            start_child(enum ldpd_process, char *, int, int);
@@ -329,7 +330,7 @@ main(int argc, char *argv[])
        master = frr_init();
 
        vty_config_lockless();
-       vrf_init(NULL, NULL, NULL, NULL);
+       vrf_init(NULL, NULL, NULL, NULL, NULL);
        access_list_init();
        ldp_vty_init();
        ldp_zebra_init(master);
@@ -483,8 +484,9 @@ start_child(enum ldpd_process p, char *argv0, int fd_async, int fd_sync)
 
        nullfd = open("/dev/null", O_RDONLY | O_NOCTTY);
        if (nullfd == -1) {
-               zlog_err("%s: failed to open /dev/null: %s", __func__,
-                        safe_strerror(errno));
+               flog_err_sys(LIB_ERR_SYSTEM_CALL,
+                            "%s: failed to open /dev/null: %s", __func__,
+                            safe_strerror(errno));
        } else {
                dup2(nullfd, 0);
                dup2(nullfd, 1);