From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Wed, 8 Jun 2016 17:10:32 +0000 (-0400)
Subject: Merge pull request #505 in SNORT/snort3 from lua_test_fix to master
X-Git-Tag: 3.0.0-233~375
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04050b5a06e613232263fdd5bae870e155232fae;p=thirdparty%2Fsnort3.git

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 2f88f48d0..b19236a66 100644
--- 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 030e013d0..00425986d 100644
--- 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)