zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / ldpd / ldpd.c

diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
index b51ff82cea5a9b035fa182dddcc4b64009d44ad0..771d3b7459a0ce97521e3151b7872a2f63ca8a1a 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);
@@ -137,7 +138,7 @@ sighup(void)
         * and build a new configuartion from scratch.
         */
        ldp_config_reset(vty_conf);
-       vty_read_config(ldpd_di.config_file, config_default);
+       vty_read_config(NULL, ldpd_di.config_file, config_default);
        ldp_config_apply(NULL, vty_conf);
 }
 
@@ -176,6 +177,9 @@ static struct quagga_signal_t ldp_signals[] =
        }
 };
 
+static const struct frr_yang_module_info *ldpd_yang_modules[] = {
+};
+
 FRR_DAEMON_INFO(ldpd, LDP,
        .vty_port = LDP_VTY_PORT,
 
@@ -185,6 +189,9 @@ FRR_DAEMON_INFO(ldpd, LDP,
        .n_signals = array_size(ldp_signals),
 
        .privs = &ldpd_privs,
+
+       .yang_modules = ldpd_yang_modules,
+       .n_yang_modules = array_size(ldpd_yang_modules),
 )
 
 static int ldp_config_fork_apply(struct thread *t)
@@ -328,8 +335,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 +489,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(EC_LIB_SYSTEM_CALL,
+                            "%s: failed to open /dev/null: %s", __func__,
+                            safe_strerror(errno));
        } else {
                dup2(nullfd, 0);
                dup2(nullfd, 1);