ldpd: use frr_init()

Without this, modules aren't loaded.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
index 710dcd15f41d49853d672df5ef1e70d58f403387..61e8e8268c7079e290e6c182c18061639edd8f10 100644 (file)
--- a/ldpd/ldpd.c
+++ b/ldpd/ldpd.c
@@ -277,9 +277,9 @@ main(int argc, char *argv[])
                exit(1);
        }
 
-       openzlog(ldpd_di.progname, "LDP", 0,
-           LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON);
-
+       if (lflag || eflag)
+               openzlog(ldpd_di.progname, "LDP", 0,
+                        LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON);
        if (lflag)
                lde();
        else if (eflag)
@@ -316,19 +316,9 @@ main(int argc, char *argv[])
        ldpe_pid = start_child(PROC_LDP_ENGINE, saved_argv0,
            pipe_parent2ldpe[1], pipe_parent2ldpe_sync[1]);
 
-       /* drop privileges */
-       zprivs_init(&ldpd_privs);
-
-       /* setup signal handler */
-       signal_init(master, array_size(ldp_signals), ldp_signals);
-
-       /* thread master */
-       master = thread_master_create();
+       master = frr_init();
 
-       /* library inits */
-       cmd_init(1);
        vty_config_lockless();
-       vty_init(master);
        vrf_init(NULL, NULL, NULL, NULL);
        access_list_init();
        ldp_vty_init();