Pull request #4308: main: apply loaded configuration only once

Merge in SNORT/snort3 from ~YCHALOV/snort3:reload_config_fix to master

Squashed commit of the following:

commit 48cb1070b58345b33c2bdca7c3c20ea38164ad3e
Author: Yurii Chalov <ychalov@cisco.com>
Date:   Wed Apr 24 23:17:02 2024 +0200

    main: apply loaded configuration only once

diff --git a/src/main/swapper.cc b/src/main/swapper.cc
index d60a42c00c992ba30f230ad3d3b0ffd4ab069e33..4f4b515452a7ac98282c5226ef848d08e607d3e3 100644 (file)
--- a/src/main/swapper.cc
+++ b/src/main/swapper.cc
@@ -63,7 +63,8 @@ void Swapper::apply(Analyzer& analyzer)
 {
     if ( new_conf )
     {
-        const bool reload = (SnortConfig::get_conf() != nullptr);
+        const auto cur_conf = SnortConfig::get_conf();
+        const bool reload = cur_conf and cur_conf != new_conf;
         SnortConfig::set_conf(new_conf);
         // FIXIT-M Determine whether we really want to do this before or after the set_conf
         if ( reload )