Module: check_mk
Branch: master
Commit: 14c76bb3d8ba20cc57d1b76e5deb92a6b62a7c51
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14c76bb3d8ba20…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Fri Jun 26 10:55:38 2015 +0200
#2316: windows agent: fixed formatting errors in cached agent sections
---
.werks/2316 | 10 ++++++++++
ChangeLog | 1 +
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 302080 -> 302080 bytes
agents/windows/check_mk_agent-64.unversioned.exe | Bin 302080 -> 302080 bytes
agents/windows/check_mk_agent.cc | 5 +++--
agents/windows/check_mk_agent.exe | Bin 183808 -> 183808 bytes
agents/windows/check_mk_agent.msi | Bin 734720 -> 734720 bytes
agents/windows/check_mk_agent.unversioned.exe | Bin 183808 -> 183808 bytes
agents/windows/crash.exe | Bin 20024 -> 20024 bytes
agents/windows/install_agent-64.exe | Bin 179043 -> 179043 bytes
agents/windows/install_agent.exe | Bin 159950 -> 160001 bytes
agents/windows/nowin.exe | Bin 22511 -> 22511 bytes
13 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/.werks/2316 b/.werks/2316
new file mode 100644
index 0000000..e43e107
--- /dev/null
+++ b/.werks/2316
@@ -0,0 +1,10 @@
+Title: windows agent: fixed formatting errors in cached agent sections
+Level: 2
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i3
+Date: 1435308547
+
+
diff --git a/ChangeLog b/ChangeLog
index 129bb11..e3d0274 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
* 2312 New checks for EMC VPLEX: emc_vplex_cpu, emc_vplex_director_stats,
emc_vplex_if, emc_vplex_volumes...
* 1260 jolokia_metrics.perm_gen: New Check to monitor used Perm Space on a JVM
* 2315 FIX: windows agent: BOM replacement, fixed incorrect byte offset...
+ * 2316 FIX: windows agent: fixed formatting errors in cached agent sections
Multisite:
* 2314 FIX: Availability: fixed exception when grouping by host or service group
diff --git a/agents/windows/build_version b/agents/windows/build_version
index bc3d544..0f11735 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-186
+196
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index d40a833..9ab768b 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.unversioned.exe
b/agents/windows/check_mk_agent-64.unversioned.exe
index ed24348..85549ab 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.cc b/agents/windows/check_mk_agent.cc
index 4531cea..9a9653f 100644
--- a/agents/windows/check_mk_agent.cc
+++ b/agents/windows/check_mk_agent.cc
@@ -3102,7 +3102,7 @@ void output_external_programs(SOCKET &out, script_type type)
{
// Determine chache_info text
char cache_info[32];
- snprintf(cache_info, sizeof(cache_info), ":cached(%d:%d)",
(int)cont->buffer_time, cont->max_age);
+ snprintf(cache_info, sizeof(cache_info), ":cached(%d,%d)",
(int)cont->buffer_time, cont->max_age);
int cache_len = strlen(cache_info) + 1;
// We need to parse each line and replace any
<<<section>>> with
<<<section:cached(123455678,3600)>>>
@@ -3117,7 +3117,8 @@ void output_external_programs(SOCKET &out, script_type type)
{
int length = strlen(line);
int cr_offset = line[length-1] == '\r' ? 1 : 0;
- if (length >=8 && (!strncmp(line,
"<<<", 3) && !strncmp(line+length-cr_offset-3,
">>>", 3)))
+ if (length >=8 && strncmp(line,
"<<<<", 4) && (!strncmp(line, "<<<", 3)
&&
+ !strncmp(line+length-cr_offset-3, ">>>",
3)))
{
// The return value of snprintf seems broken (off by 3?).
Great...
write_bytes = length - cr_offset - 3 + 1; // length - \r -
<<< + \0
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index 4d488dd..ab87943 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 ed21e07..971b791 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.unversioned.exe
b/agents/windows/check_mk_agent.unversioned.exe
index 20352f8..5bba86d 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/crash.exe b/agents/windows/crash.exe
index a58557b..1ca41df 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 61dc03a..0159fcf 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 51d42c2..4fcb964 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 4ef5457..5d2d67b 100755
Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ