Merge pull request #505 in SNORT/snort3 from lua_test_fix to master

Squashed commit of the following:

commit 16e99a65877eed3aa82597a07b9331f6e2b37564
Author: Bhagya Tholpady <bbantwal@cisco.com>
Date:   Wed Jun 8 12:21:06 2016 -0400

    Adding call to release scripts

diff --git a/src/main/help.cc b/src/main/help.cc
index 2f88f48d02b7d01c1e8db672cf3e0a565d95fff9..b19236a661e5b763a8e1153a918c873203ea3950 100644 (file)
--- a/src/main/help.cc
+++ b/src/main/help.cc
@@ -206,6 +206,7 @@ NORETURN static void show_help(SnortConfig* sc, const char* val, HelpType ht)
     }
     ModuleManager::term();
     PluginManager::release_plugins();
+    ScriptManager::release_scripts();
     delete snort_conf;
     exit(0);
 }

diff --git a/src/main/snort.cc b/src/main/snort.cc
index 030e013d0e144d885ae7b02d748347f33d6ed023..00425986d13654663dc27433cf56594707c3dd5b 100644 (file)
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -411,6 +411,7 @@ void Snort::term()
     SideChannelManager::term();
     ModuleManager::term();
     PluginManager::release_plugins();
+    ScriptManager::release_scripts();
 }
 
 void Snort::clean_exit(int)