Changeset d7e265d in nscp for modules/CheckExternalScripts

Timestamp:

08/25/11 07:59:17 (21 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

8840f09

Parents:

b38e845

Message:

• Fixed some issues in the NSCPClient

File:

• modules/CheckExternalScripts/CheckExternalScripts.cpp (modified) (2 diffs)

modules/CheckExternalScripts/CheckExternalScripts.cpp

@@ -157 +157 @@
       BOOST_FOREACH(std::wstring str, data.args) {
         if (first && !isAlias && !allowNasty_) {
-          if (str.find_first_of(NASTY_METACHARS) != std::wstring::npos) {
-            return nscapi::functions::create_simple_query_response_unknown(_T("Request contained illegal characters!"), _T(""), response, data.command);
+          if (str.find_first_of(NASTY_METACHARS_W) != std::wstring::npos) {
+            return nscapi::functions::create_simple_query_response_unknown(data.command, _T("Request contained illegal characters!"), _T(""), response);
 
           }
@@ -191 +191 @@
     int result = process::executeProcess(process::exec_arguments(root_, cd.command + _T(" ") + xargs, timeout), message, perf);
     if (!nscapi::plugin_helper::isNagiosReturnCode(result)) {
-      nscapi::functions::create_simple_query_response(NSCAPI::returnUNKNOWN, _T("The command (") + cd.command + _T(") returned an invalid return code: ") + strEx::itos(result), _T(""), response, data.command);
+      nscapi::functions::create_simple_query_response_unknown(data.command, _T("The command (") + cd.command + _T(") returned an invalid return code: ") + strEx::itos(result), _T(""), response);
       return NSCAPI::returnUNKNOWN;
     }
-    nscapi::functions::create_simple_query_response(nscapi::plugin_helper::int2nagios(result), message, perf, response, data.command);
+    nscapi::functions::create_simple_query_response(data.command, nscapi::plugin_helper::int2nagios(result), message, perf, response);
     return result;
   }