From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Fri, 3 Apr 2020 00:15:21 +0000 (+0000)
Subject: Merge pull request #2122 in SNORT/snort3 from ~DAVMCPHE/snort3:consistent_reloaderror... 
X-Git-Tag: 3.0.1-2~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fbd6be178c18019c2859eda3fb0082c5d340a79;p=thirdparty%2Fsnort3.git

Merge pull request #2122 in SNORT/snort3 from ~DAVMCPHE/snort3:consistent_reloaderror_messages to master

Squashed commit of the following:

commit 57247262ea9e7a32905c0e066fff83da239defb6
Author: davis mcpherson <davmcphe@cisco.com>
Date:   Wed Apr 1 09:17:48 2020 -0400

    reload: update ReloadError response messages to use consistent wording across all messages
---

diff --git a/src/file_api/file_module.cc b/src/file_api/file_module.cc
index 58be9bf45..8ae34ab09 100644
--- a/src/file_api/file_module.cc
+++ b/src/file_api/file_module.cc
@@ -290,7 +290,7 @@ bool FileIdModule::set(const char*, Value& v, SnortConfig*)
         {
             if (Snort::is_reloading() && !FileService::is_file_capture_enabled())
             {
-                ReloadError("Enabling file_id.enable_capture requires a restart\n");
+                ReloadError("Changing file_id.enable_capture requires a restart.\n");
                 return false;
             }
             fp.set_file_capture(true);
@@ -388,7 +388,7 @@ bool FileIdModule::set(const char*, Value& v, SnortConfig*)
         if (file_rule.use.capture_enabled && Snort::is_reloading()
             && !FileService::is_file_capture_enabled())
         {
-            ReloadError("Enabling file_id.enable_file_capture requires a restart\n");
+            ReloadError("Changing file_id.enable_file_capture requires a restart.\n");
             return false;
         }
     }
diff --git a/src/file_api/file_service.cc b/src/file_api/file_service.cc
index 7aaaf7bdd..01eacf7a4 100644
--- a/src/file_api/file_service.cc
+++ b/src/file_api/file_service.cc
@@ -87,14 +87,14 @@ void FileService::verify_reload(SnortConfig* sc)
         return;
 
     if (max_files_cached != conf->max_files_cached)
-        ReloadError("Changing file_id.max_files_cached requires a restart\n");
+        ReloadError("Changing file_id.max_files_cached requires a restart.\n");
 
     if (file_capture_enabled)
     {
         if (capture_memcap != conf->capture_memcap)
-            ReloadError("Changing file_id.capture_memcap requires a restart\n");
+            ReloadError("Changing file_id.capture_memcap requires a restart.\n");
         if (capture_block_size != conf->capture_block_size)
-            ReloadError("Changing file_id.capture_block_size requires a restart\n");
+            ReloadError("Changing file_id.capture_block_size requires a restart.\n");
     }
 }
 
diff --git a/src/stream/base/stream_module.cc b/src/stream/base/stream_module.cc
index c0096e5d8..f700a6ba5 100644
--- a/src/stream/base/stream_module.cc
+++ b/src/stream/base/stream_module.cc
@@ -212,7 +212,7 @@ bool StreamReloadResourceManager::initialize(const StreamModuleConfig& config_)
 #ifdef REG_TEST
     if ( config.footprint != config_.footprint )
     {
-        ReloadError("Changing of stream.footprint requires a restart\n");
+        ReloadError("Changing stream.footprint requires a restart.\n");
         return false;
     }
 #endif