From adf8924df66f9249e1294eee365cdebf17c897d4 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Fri, 23 Apr 2021 15:17:07 +0200 Subject: [PATCH] ldpd: set `frr_is_after_fork` in lde/ldpe These subprocesses don't use frr_config_fork(), so frr_is_after_fork is never set. While the frr_pthread stuff isn't currently used there, set the flag anyway to avoid future headaches. Signed-off-by: David Lamparter --- ldpd/lde.c | 2 ++ ldpd/ldpe.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ldpd/lde.c b/ldpd/lde.c index 8fa74d1c3d..02dcec750b 100644 --- a/ldpd/lde.c +++ b/ldpd/lde.c @@ -134,6 +134,8 @@ lde(void) log_procname = log_procnames[PROC_LDE_ENGINE]; master = frr_init(); + /* no frr_config_fork() here, allow frr_pthread to create threads */ + frr_is_after_fork = true; /* setup signal handler */ signal_init(master, array_size(lde_signals), lde_signals); diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c index d09eb2fa33..428d2ab7b4 100644 --- a/ldpd/ldpe.c +++ b/ldpd/ldpe.c @@ -111,6 +111,8 @@ ldpe(void) log_procname = log_procnames[ldpd_process]; master = frr_init(); + /* no frr_config_fork() here, allow frr_pthread to create threads */ + frr_is_after_fork = true; /* setup signal handler */ signal_init(master, array_size(ldpe_signals), ldpe_signals);