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 87aa5ad60960de065066b3905156e714555a7f62..f5c3da1fa44b07a646baeea2b393903e7e73b888 100644 (file)
--- 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;
 }