From: Steve Chew (stechew) <stechew@cisco.com>
Date: Wed, 25 Nov 2020 18:17:46 +0000 (+0000)
Subject: Merge pull request #2638 in SNORT/snort3 from ~SBAIGAL/snort3:shell_core_fix to master
X-Git-Tag: 3.0.3-6~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ce634739012b02a8b00be94c38d53e04cda027c;p=thirdparty%2Fsnort3.git

Merge pull request #2638 in SNORT/snort3 from ~SBAIGAL/snort3:shell_core_fix to master

Squashed commit of the following:

commit 0058db07c7aaa0690898c550a2b5310b25a7feb3
Author: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date:   Mon Nov 23 15:31:21 2020 -0500

    reload: reset default policies after failed reload
---

diff --git a/src/main/snort.cc b/src/main/snort.cc
index 87aa5ad60..f5c3da1fa 100644
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -441,6 +441,7 @@ void Snort::reload_failure_cleanup(SnortConfig* sc)
 {
     parser_term(sc);
     delete sc;
+    set_default_policy(SnortConfig::get_conf());
     reloading = false;
 }