Merge pull request #5549 from donaldsharp/automated

[mirror_frr.git] / ospfd / ospf_main.c

diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 36bb8d49b595caefd3c4c3af2fbad29482a7a0c2..d02ffe0448df73ad394fd1e04c67218729d2b850 100644 (file)
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -35,7 +35,6 @@
 #include "stream.h"
 #include "log.h"
 #include "memory.h"
-#include "memory_vty.h"
 #include "privs.h"
 #include "sigevent.h"
 #include "zclient.h"
@@ -72,9 +71,11 @@ struct zebra_privs_t ospfd_privs = {
        .cap_num_i = 0};
 
 /* OSPFd options. */
-struct option longopts[] = {{"instance", required_argument, NULL, 'n'},
-                           {"apiserver", no_argument, NULL, 'a'},
-                           {0}};
+const struct option longopts[] = {
+       {"instance", required_argument, NULL, 'n'},
+       {"apiserver", no_argument, NULL, 'a'},
+       {0}
+};
 
 /* OSPFd program name */
 
@@ -123,7 +124,7 @@ struct quagga_signal_t ospf_signals[] = {
        },
 };
 
-static const struct frr_yang_module_info *ospfd_yang_modules[] = {
+static const struct frr_yang_module_info *const ospfd_yang_modules[] = {
        &frr_interface_info,
 };
 
@@ -216,16 +217,6 @@ int main(int argc, char **argv)
        /* OSPF errors init */
        ospf_error_init();
 
-       /* Need to initialize the default ospf structure, so the interface mode
-          commands can be duly processed if they are received before 'router
-          ospf',
-          when quagga(ospfd) is restarted */
-       if (!ospf_get_instance(instance)) {
-               flog_err(EC_OSPF_INIT_FAIL, "OSPF instance init failed: %s",
-                        strerror(errno));
-               exit(1);
-       }
-
        frr_config_fork();
        frr_run(master);