Module: check_mk
Branch: master
Commit: 71eb0f3ce7280319249d58e0cd2e1a86e2506819
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71eb0f3ce72803…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Oct 4 10:55:45 2012 +0200
FIX: Windows agent: quote '%' in plugin output correctly
Conflicts:
agents/windows/check_mk_agent.exe
agents/windows/install_agent.exe
---
ChangeLog | 1 +
agents/windows/check_mk_agent.cc | 2 +-
agents/windows/check_mk_agent.exe | Bin 105472 -> 105472 bytes
agents/windows/install_agent.exe | Bin 127802 -> 126273 bytes
4 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1e92aa1..a214ef8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -38,6 +38,7 @@
Checks & Agents:
* FIX: Linux mk_logwatch: iregex Parameter was never used
+ * FIX: Windows agent: quote '%' in plugin output correctly
1.2.1i1:
Core:
diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc
index 70ff29c..4fe8134 100755
--- a/agents/windows/check_mk_agent.cc
+++ b/agents/windows/check_mk_agent.cc
@@ -1490,7 +1490,7 @@ void run_plugin(SOCKET &out, char *path)
if (f) {
char line[4096];
while (0 != fgets(line, sizeof(line), f)) {
- output(out, line);
+ output(out, "%s", line);
}
pclose(f);
}
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index a1831b2..16eb20d 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.exe b/agents/windows/install_agent.exe
index 0eeee29..3c820af 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ