Module: check_mk
Branch: master
Commit: 6adafc008299cdd9b892464ac9f4151b3e00610f
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6adafc008299cd…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Mar 3 15:04:34 2014 +0100
FIX windows agent: now able to process perl scripts
The windows agent was unable to process perl scripts
in the local and plugin directories.
---
.werks/563 | 9 +++++++++
ChangeLog | 1 +
agents/windows/check_mk_agent-64.exe | Bin 190464 -> 190464 bytes
agents/windows/check_mk_agent.cc | 5 +++++
agents/windows/check_mk_agent.exe | Bin 160768 -> 160768 bytes
agents/windows/install_agent-64.exe | Bin 154588 -> 154557 bytes
agents/windows/install_agent.exe | Bin 151690 -> 151776 bytes
7 files changed, 15 insertions(+)
diff --git a/.werks/563 b/.werks/563
new file mode 100644
index 0000000..8a7514e
--- /dev/null
+++ b/.werks/563
@@ -0,0 +1,9 @@
+Title: windows agent: now able to process perl scripts
+Level: 1
+Component: checks
+Version: 1.2.5i1
+Date: 1393855405
+Class: fix
+
+The windows agent was unable to process perl scripts
+in the local and plugin directories.
diff --git a/ChangeLog b/ChangeLog
index af76085..6749199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -193,6 +193,7 @@
* 0703 FIX: brocade_mlx: omit inventory of cpu and memory on more states...
* 0137 FIX: Fixed printer_pages...
* 0587 FIX: if64: problems resolved when running as a clustered service...
+ * 0563 FIX: windows agent: now able to process perl scripts...
Multisite:
* 0371 Added log class filter to hostsvcevents view
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index df20359..d8cc2e4 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.cc b/agents/windows/check_mk_agent.cc
index 7f1bd40..07ca693 100755
--- a/agents/windows/check_mk_agent.cc
+++ b/agents/windows/check_mk_agent.cc
@@ -2461,6 +2461,11 @@ char *add_interpreter(char *path, char *newpath)
snprintf(newpath, 256, "powershell.exe -NoLogo -ExecutionPolicy RemoteSigned
\"& \'%s\'\"", path);
return newpath;
}
+ else if (!strcmp(path + strlen(path) - 3, ".pl")) {
+ // Perl scripts get perl.exe as interpreter
+ snprintf(newpath, 256, "perl.exe \"%s\"", path);
+ return newpath;
+ }
else {
snprintf(newpath, 256, "\"%s\"", path);
return newpath;
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index 9bd2a02..9cccad6 100755
Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe
differ
diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe
index 896a244..fb29884 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 2331b58..ebb6a2a 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ