From: Steve Chew (stechew) <stechew@cisco.com>
Date: Tue, 21 Apr 2020 14:25:53 +0000 (+0000)
Subject: Merge pull request #2155 in SNORT/snort3 from ~SBAIGAL/snort3:show_plugins to master
X-Git-Tag: 3.0.1-2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b0c433f955593ec8c842e324f58bfc5f2128186;p=thirdparty%2Fsnort3.git

Merge pull request #2155 in SNORT/snort3 from ~SBAIGAL/snort3:show_plugins to master

Squashed commit of the following:

commit 1b3e79195b4c3ea23bd24b3177a71a2ded085e64
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Mon Apr 13 11:55:20 2020 -0400

    plugin_manager: make sure --show-plugins option picks up SO plugins
---

diff --git a/src/main/snort.cc b/src/main/snort.cc
index 0b6a7150e..184713ad8 100644
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -140,12 +140,6 @@ void Snort::init(int argc, char** argv)
     PluginManager::load_plugins(snort_cmd_line_conf->plugin_path);
     ModuleManager::load_params();
 
-    if ( snort_cmd_line_conf->logging_flags & LOGGING_FLAG__SHOW_PLUGINS )
-    {
-        ModuleManager::dump_modules();
-        PluginManager::dump_plugins();
-    }
-
     FileService::init();
 
     parser_init();
@@ -162,6 +156,12 @@ void Snort::init(int argc, char** argv)
     TraceLogApi::thread_init(sc);
 
     PluginManager::load_so_plugins(sc);
+
+    if ( snort_cmd_line_conf->logging_flags & LOGGING_FLAG__SHOW_PLUGINS )
+    {
+        ModuleManager::dump_modules();
+        PluginManager::dump_plugins();
+    }
 #ifdef PIGLET
     if ( !Piglet::piglet_mode() )
 #endif