Merge pull request #2469 in SNORT/snort3 from ~OSHUMEIK/snort3:wand to master

Squashed commit of the following:

commit 1c363abe0803a853ce6945c35fc58ed1b091265b
Author: Oleksii Shumeiko <oshumeik@cisco.com>
Date:   Fri Sep 11 11:50:10 2020 +0300

    wizard: fix the error message about invalid pattern

diff --git a/src/service_inspectors/wizard/wiz_module.cc b/src/service_inspectors/wizard/wiz_module.cc
index c2acf44db435141164e02295211bfd3cd063e017..c6d2b8ce4a1aca66a8f6f5fab94b5bc151a142e0 100644 (file)
--- a/src/service_inspectors/wizard/wiz_module.cc
+++ b/src/service_inspectors/wizard/wiz_module.cc
@@ -200,7 +200,7 @@ bool WizardModule::add_spells(MagicBook* b, string& service, bool hex)
             if ( !val )
             {
                 ParseError("Invalid %s '%s' for service '%s'",
-                    hex ? "hex" : "spell", service.c_str(), p.c_str());
+                    hex ? "hex" : "spell", p.c_str(), service.c_str());
                 return false;
             }
             else if ( service != val )