Merged in dstaesse/ouroboros/be-ipcpd-main-fix (pull request #587)

ipcpd: Fix double finalization after some failures

1 files changed, 4 insertions, 5 deletions

diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index bc135c31..22b6e718 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -142,10 +142,6 @@ static void finalize_components(void)
 
         free(ipcpi.dif_name);
 
-        enroll_fini();
-
-        connmgr_fini();
-
         rib_fini();
 }
 
@@ -397,9 +393,12 @@ int main(int    argc,
         if (ipcp_get_state() == IPCP_SHUTDOWN) {
                 dt_stop();
                 stop_components();
+                finalize_components();
         }
 
-        finalize_components();
+        enroll_fini();
+
+        connmgr_fini();
 
         irm_unbind_api(getpid(), ipcpi.name);