lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / ospfd / ospf_main.c

diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 8853802d07e58b3ab1d1f57d08e91eb166589091..36bb8d49b595caefd3c4c3af2fbad29482a7a0c2 100644 (file)
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -123,13 +123,18 @@ struct quagga_signal_t ospf_signals[] = {
        },
 };
 
+static const struct frr_yang_module_info *ospfd_yang_modules[] = {
+       &frr_interface_info,
+};
+
 FRR_DAEMON_INFO(ospfd, OSPF, .vty_port = OSPF_VTY_PORT,
 
                .proghelp = "Implementation of the OSPFv2 routing protocol.",
 
                .signals = ospf_signals, .n_signals = array_size(ospf_signals),
 
-               .privs = &ospfd_privs, )
+               .privs = &ospfd_privs, .yang_modules = ospfd_yang_modules,
+               .n_yang_modules = array_size(ospfd_yang_modules), )
 
 /* OSPFd main routine. */
 int main(int argc, char **argv)
@@ -187,7 +192,7 @@ int main(int argc, char **argv)
        master = om->master;
 
        /* Library inits. */
-       debug_init();
+       ospf_debug_init();
        ospf_vrf_init();
 
        access_list_init();
@@ -216,8 +221,8 @@ int main(int argc, char **argv)
           ospf',
           when quagga(ospfd) is restarted */
        if (!ospf_get_instance(instance)) {
-               flog_err(OSPF_ERR_INIT_FAIL, "OSPF instance init failed: %s",
-                         strerror(errno));
+               flog_err(EC_OSPF_INIT_FAIL, "OSPF instance init failed: %s",
+                        strerror(errno));
                exit(1);
        }