From 16156c1018e9b8030d0adc13234a29902b940e2d Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Wed, 17 May 2017 21:34:01 +0200 Subject: [PATCH] ldpd: use frr_init() Without this, modules aren't loaded. Signed-off-by: David Lamparter --- ldpd/ldpd.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index 710dcd15f4..61e8e8268c 100644 --- 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); + master = frr_init(); - /* setup signal handler */ - signal_init(master, array_size(ldp_signals), ldp_signals); - - /* thread master */ - master = thread_master_create(); - - /* library inits */ - cmd_init(1); vty_config_lockless(); - vty_init(master); vrf_init(NULL, NULL, NULL, NULL); access_list_init(); ldp_vty_init();