Merge pull request #2673 in SNORT/snort3 from ~SBAIGAL/snort3:ha_leak to master

Squashed commit of the following:

commit 346acd5e8b316701a2f5b7e98ff780bd6e68a095
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Wed Dec 16 16:00:06 2020 -0500

    reload_config: fix memory leak casued by incorrect code merge

diff --git a/src/main.cc b/src/main.cc
index 9b044399a2aa5109452b178c7e5ac7faa43fc937..8282d9ed44083837d4419b28ff311b03b8b777e4 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -370,12 +370,6 @@ int main_reload_config(lua_State* L)
         return 0;
     }
 
-    if ( !sc->attribute_hosts_file.empty() )
-    {
-        if ( !HostAttributesManager::load_hosts_file(sc, sc->attribute_hosts_file.c_str()) )
-            current_request->respond("== reload failed - host attributes file failed to load\n");
-    }
-
     int32_t num_hosts = HostAttributesManager::get_num_host_entries();
     if ( num_hosts >= 0 )
         LogMessage( "host attribute table: %d hosts loaded\n", num_hosts);