From: Russ Combs <rucombs@cisco.com>
Date: Wed, 13 Aug 2014 00:18:20 +0000 (-0400)
Subject: fixed quiet mode when parsing conf
X-Git-Tag: 3.0.0-233~1426^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16c6eca0eb2f264e08d5dec2b313c1b2b1ace6cc;p=thirdparty%2Fsnort3.git

fixed quiet mode when parsing conf
---

diff --git a/src/main/snort.cc b/src/main/snort.cc
index 726d5adf8..487f01864 100644
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -327,7 +327,7 @@ static void SnortInit(int argc, char **argv)
 
     register_profiles();
 
-    SnortConfig* sc = ParseSnortConf(snort_cmd_line_conf->var_list);
+    SnortConfig* sc = ParseSnortConf(snort_cmd_line_conf);
 
     /* Merge the command line and config file confs to take care of
      * command line overriding config file.
@@ -614,7 +614,7 @@ void snort_cleanup()
 // instantiate things that can be reloaded
 static SnortConfig * get_reload_config(void)
 {
-    SnortConfig *sc = ParseSnortConf(snort_cmd_line_conf->var_list);
+    SnortConfig *sc = ParseSnortConf(snort_cmd_line_conf);
 
     sc = MergeSnortConfs(snort_cmd_line_conf, sc);
 
diff --git a/src/managers/module_manager.cc b/src/managers/module_manager.cc
index defbcb2a2..6fbe9f206 100644
--- a/src/managers/module_manager.cc
+++ b/src/managers/module_manager.cc
@@ -361,8 +361,6 @@ bool open_table(const char* s, int idx)
     if ( last != key )
     {
         if ( !last.size() )
-            // FIXIT is this not main thread?  snort_conf
-            // differs from main and -q is broken here
             LogMessage("Configuring modules:\n");
 
         LogMessage("\t %s\n", key.c_str());
diff --git a/src/parser/parser.cc b/src/parser/parser.cc
index c03038bba..d50fd3a55 100644
--- a/src/parser/parser.cc
+++ b/src/parser/parser.cc
@@ -595,11 +595,14 @@ static void IntegrityCheckRules(SnortConfig *sc)
  *      configuration file to parse the rules.
  *
  ***************************************************************************/
-SnortConfig * ParseSnortConf(VarNode* tmp)
+SnortConfig * ParseSnortConf(const SnortConfig* boot_conf)
 {
     SnortConfig *sc = SnortConfNew();
     snort_conf = sc;
 
+    sc->logging_flags = boot_conf->logging_flags;
+    VarNode* tmp = boot_conf->var_list;
+
     const char* fname = get_snort_conf();
 
     if ( !fname )
diff --git a/src/parser/parser.h b/src/parser/parser.h
index 42decd350..433e0a688 100644
--- a/src/parser/parser.h
+++ b/src/parser/parser.h
@@ -45,7 +45,7 @@ void pop_parse_location();
 void inc_parse_position();
 
 /* rule setup funcs */
-SnortConfig * ParseSnortConf(struct VarNode*);
+SnortConfig * ParseSnortConf(const SnortConfig*);
 void ParseRules(SnortConfig *);
 
 void OrderRuleLists(SnortConfig *, const char *);