From: George Koikara (gkoikara) <gkoikara@cisco.com>
Date: Wed, 11 Mar 2020 18:07:10 +0000 (+0000)
Subject: Merge pull request #2040 in SNORT/snort3 from ~KBHANDAN/snort3:fw_reload to master
X-Git-Tag: 3.0.0-269~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1468ea1ad884873c05de4cb8e3aed54cbbaec7e;p=thirdparty%2Fsnort3.git

Merge pull request #2040 in SNORT/snort3 from ~KBHANDAN/snort3:fw_reload to master

Squashed commit of the following:

commit d555619fa3df7e73a2921d8ff353dcc724877558
Author: Kaushal Bhandankar <kbhandan@cisco.com>
Date:   Thu Feb 27 03:44:42 2020 -0500

    main: do FileService::post_init after inspectors are configured
---

diff --git a/src/main/snort.cc b/src/main/snort.cc
index 45c4548fc..9d2e50340 100644
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -173,7 +173,6 @@ void Snort::init(int argc, char** argv)
         sc->rule_order = "reset block drop alert pass log";
 
     sc->setup();
-    FileService::post_init();
 
     // Must be after CodecManager::instantiate()
     if ( !InspectorManager::configure(sc) )
@@ -181,6 +180,9 @@ void Snort::init(int argc, char** argv)
     else if ( SnortConfig::log_verbose() )
         InspectorManager::print_config(sc);
 
+    // Must be after InspectorManager::configure()
+    FileService::post_init();
+
     ModuleManager::reset_stats(sc);
 
     if (sc->file_mask != 0)