From 0f133bad7febc788c093df6481a5d5f3106aa70b Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Wed, 10 Jun 2020 20:30:02 +0200 Subject: [PATCH] lib: set up TLS log buffer after forking ... it contains our pid, so doing it before fork leads to littering buffers since we try to clean up with the forked pid... Fixes: #6541 Signed-off-by: David Lamparter --- lib/libfrr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libfrr.c b/lib/libfrr.c index ac165f254e..4f33ac70e8 100644 --- a/lib/libfrr.c +++ b/lib/libfrr.c @@ -661,7 +661,6 @@ struct thread_master *frr_init(void) zlog_init(di->progname, di->logname, di->instance, ids.uid_normal, ids.gid_normal); - zlog_tls_buffer_init(); command_setup_early_logging(di->early_logging, di->early_loglevel); @@ -936,6 +935,7 @@ void frr_config_fork(void) if (!di->pid_file) di->pid_file = pidfile_default; pid_output(di->pid_file); + zlog_tls_buffer_init(); } static void frr_vty_serv(void) -- 2.39.5