ldpd: clean up temp zlog files

Clean up the temp zlog dirs in /var/tmp/frr/ that the ldpd
child processes were leaving. The child processes do a non-
standard lib init/deinit, so they need to explicitly deinit
the zlog module.

Signed-off-by: Mark Stapp <mjs@voltanet.io>

diff --git a/ldpd/lde.c b/ldpd/lde.c
index 32202789603dfdd56bdddffc4dd1c55c5de7dda9..afcbe6cd44e04b9f45d27f8b431e33b27df5c1b3 100644 (file)
--- a/ldpd/lde.c
+++ b/ldpd/lde.c
@@ -206,6 +206,8 @@ lde_shutdown(void)
        free(iev_main_sync);
 
        log_info("label decision engine exiting");
+
+       zlog_fini();
        exit(0);
 }
 

diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
index 56734a4f766313b962d0eb4e27c9c0e13eaa3174..e3b6f4dfcca9ce65131169319a217f3e3e0f1ea7 100644 (file)
--- a/ldpd/ldpd.c
+++ b/ldpd/ldpd.c
@@ -495,7 +495,8 @@ start_child(enum ldpd_process p, char *argv0, int fd_async, int fd_sync)
        int      argc = 0, nullfd;
        pid_t    pid;
 
-       switch (pid = fork()) {
+       pid = fork();
+       switch (pid) {
        case -1:
                fatal("cannot fork");
        case 0:

diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c
index bae8a6e5c314c7216f8a3b269a270916a13c078f..3f0a4fd33e3bbaa437bdf405294b07a26e4eb1f3 100644 (file)
--- a/ldpd/ldpe.c
+++ b/ldpd/ldpe.c
@@ -235,6 +235,9 @@ ldpe_shutdown(void)
        free(pkt_ptr);
 
        log_info("ldp engine exiting");
+
+       zlog_fini();
+
        exit(0);
 }