diff --git a/CHANGES b/CHANGES index 5b4791cf61..a5417faca1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +4.1.0-dev.918 | 2021-07-08 18:00:26 -0700 + + * Fix a compile warning on FreeBSD (Tim Wojtulewicz, Corelight) + 4.1.0-dev.916 | 2021-07-08 16:49:55 -0700 diff --git a/VERSION b/VERSION index bc3fe99cf4..f18f41e471 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.1.0-dev.916 +4.1.0-dev.918 diff --git a/src/supervisor/Supervisor.cc b/src/supervisor/Supervisor.cc index ac16bae1ff..1033d6f03a 100644 --- a/src/supervisor/Supervisor.cc +++ b/src/supervisor/Supervisor.cc @@ -766,7 +766,9 @@ void Stem::Destroy(SupervisorNode* node) const usleep(10); if ( Wait(node, WNOHANG) ) + { break; + } DBG_STEM("Stem waiting to destroy node: %s (PID %d)", node->Name().data(), node->pid); @@ -900,7 +902,9 @@ void Stem::Shutdown(int exit_code) auto nodes_alive = AliveNodeCount(); if ( nodes_alive == 0 ) + { exit(exit_code); + } DBG_STEM("Stem nodes still alive %d, sleeping for %d seconds", nodes_alive, kill_delay);