Module: check_mk
Branch: master
Commit: 8d7fa42ad2a66916eec2576324827c9cb2f37469
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d7fa42ad2a669…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri May 23 17:09:28 2014 +0200
FIX windows agent: now able to execute python scripts again
---
.werks/924 | 8 ++++++++
ChangeLog | 1 +
agents/windows/check_mk_agent-64.exe | Bin 204800 -> 204800 bytes
agents/windows/check_mk_agent.cc | 5 +++++
agents/windows/check_mk_agent.exe | Bin 175104 -> 175104 bytes
agents/windows/crash.exe | Bin 20024 -> 20024 bytes
agents/windows/install_agent-64.exe | Bin 158175 -> 158244 bytes
agents/windows/install_agent.exe | Bin 155326 -> 155364 bytes
agents/windows/nowin.exe | Bin 22511 -> 22511 bytes
9 files changed, 14 insertions(+)
diff --git a/.werks/924 b/.werks/924
new file mode 100644
index 0000000..6763425
--- /dev/null
+++ b/.werks/924
@@ -0,0 +1,8 @@
+Title: windows agent: now able to execute python scripts again
+Level: 1
+Component: checks
+Version: 1.2.5i3
+Date: 1400857728
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 9ec0dda..ff51c64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,7 @@
* 0611 FIX: nfsexports.solaris: fix in determination of path prefix
* 0953 FIX: brocade_mlx_temp: special treatment for devices sometimes not delivering
temperature by SNMP
* 0958 FIX: df.include: failed for checks with grouping patterns...
+ * 0924 FIX: windows agent: now able to execute python scripts again
Multisite:
* 0779 Hostgroups (Summary): Empty hostgroups are no longer shown (can be re-enabled
by filter)
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index f54c406..e17986b 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 615a546..e7fa13b 100755
--- a/agents/windows/check_mk_agent.cc
+++ b/agents/windows/check_mk_agent.cc
@@ -2466,6 +2466,11 @@ char *add_interpreter(char *path, char *newpath)
snprintf(newpath, 256, "perl.exe \"%s\"", path);
return newpath;
}
+ else if (!strcmp(path + strlen(path) - 3, ".py")) {
+ // Python scripts get python interpreter
+ snprintf(newpath, 256, "python.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 75ecbc5..3a353d7 100755
Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe
differ
diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe
index 952e63a..eeca449 100755
Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ
diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe
index 783a9a1..559d7ed 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 a0acc6c..3ddaee1 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ
diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe
index 492340b..f86b848 100755
Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ