[checkmk-commits] 3823 FIX The windows agent were unable to execute powershell,

python and pearl scripts Message-ID: <5800dfe9.ABt58KJPkVHaC5YE%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 2d91bf86927fe4b847d12e0295820d9c1d648d00 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d91bf86927fe4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Oct 14 15:34:38 2016 +0200 3823 FIX The windows agent were unable to execute powershell, python and pearl scripts --- .werks/3823 | 9 +++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1324544 -> 1324544 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15382124 -> 15382124 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1324544 -> 1324544 bytes agents/windows/check_mk_agent.exe | Bin 1298944 -> 1299456 bytes agents/windows/check_mk_agent.msi | Bin 2893312 -> 2893824 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13294903 -> 13294903 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1298944 -> 1299456 bytes agents/windows/install_agent-64.exe | Bin 584705 -> 584706 bytes agents/windows/install_agent.exe | Bin 581474 -> 581396 bytes agents/windows/sections/SectionPluginGroup.cc | 4 ++-- 13 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/3823 b/.werks/3823 new file mode 100644 index 0000000..660583e --- /dev/null +++ b/.werks/3823 @@ -0,0 +1,9 @@ +Title: The windows agent were unable to execute powershell, python and pearl scripts +Level: 2 +Component: checks +Compatible: compat +Version: 1.4.0i2 +Date: 1476451997 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c368072..a0cf2e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ * 3936 FIX: chrony: support new params dictionary and rule "State of NTP time synchronisation" * 3649 FIX: Added a workaround for an escaping-related bug in old bash versions... * 3958 FIX: netapp_qtree_quota: fixed graph scaling + * 3823 FIX: The windows agent were unable to execute powershell, python and pearl scripts Multisite: * 3897 FIX: Fixed possible exception in raw edition when rendering graphs diff --git a/agents/windows/build_version b/agents/windows/build_version index 102ae24..4bc9790 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2105 +2114 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index e7dca43..1999ec9 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 59e6df6..424b7d0 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index dc59c3f..eead573 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 22829d5..95007b2 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 9f381e4..95cd100 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 79e0699..dc59afa 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index f524858..87a232c 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index d4c9e3e..ba706ab 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 5e96350..1dbe35a 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/sections/SectionPluginGroup.cc b/agents/windows/sections/SectionPluginGroup.cc index 23d80d5..4166f4b 100644 --- a/agents/windows/sections/SectionPluginGroup.cc +++ b/agents/windows/sections/SectionPluginGroup.cc @@ -476,12 +476,12 @@ bool SectionPluginGroup::fileInvalid(const char *name) const { } std::string SectionPluginGroup::withInterpreter(const char *path) const { - size_t path_len = strlen(path) - 4; + size_t path_len = strlen(path); if (!strcmp(path + path_len - 3, ".pl")) { return std::string("perl.exe \"") + path + "\""; } else if (!strcmp(path + path_len - 3, ".py")) { return std::string("python.exe \"") + path + "\""; - } else if (!strcmp(path + path_len, ".vbs")) { + } else if (!strcmp(path + path_len - 4, ".vbs")) { // If this is a vbscript don't rely on the default handler for this // file extensions. This might be notepad or some other editor by // default on a lot of systems. So better add cscript as interpreter.