Module: check_mk Branch: master Commit: 168d9d8252bd2689bdb22257f9105ae54db0526c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=168d9d8252bd26… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Jun 25 14:59:12 2015 +0200 #2315 FIX windows agent: BOM replacement, fixed incorrect byte offset The windows agent did not correctly detect byte order marks for plugins using an UTF-8 encoding. UTF-16 was working as intented. --- .werks/2315 | 11 +++++++++++ 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 | 2 +- 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/install_agent-64.exe | Bin 179003 -> 179043 bytes agents/windows/install_agent.exe | Bin 159944 -> 159950 bytes 11 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/2315 b/.werks/2315 new file mode 100644 index 0000000..d6bb9cf --- /dev/null +++ b/.werks/2315 @@ -0,0 +1,11 @@ +Title: windows agent: BOM replacement, fixed incorrect byte offset +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i3 +Date: 1435237065 +Class: fix + +The windows agent did not correctly detect byte order marks for +plugins using an UTF-8 encoding. UTF-16 was working as intented. + diff --git a/ChangeLog b/ChangeLog index 77a897d..79d1fb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * 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... 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 dc37bbd..bc3d544 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -184 +186 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index e2b1c00..d40a833 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 a502431..ed24348 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 7920a85..4531cea 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3089,7 +3089,7 @@ void output_external_programs(SOCKET &out, script_type type) else if ( strlen(cont->buffer_work) >= 3 && (unsigned char)cont->buffer_work[0] == 0xEF && (unsigned char)cont->buffer_work[1] == 0xBB && - (unsigned char)cont->buffer_work[1] == 0xBF ) + (unsigned char)cont->buffer_work[2] == 0xBF ) { cont->buffer_work[0] = '\n'; cont->buffer_work[1] = '\n'; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index aedf9a1..4d488dd 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 d768c91..ed21e07 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 012d67e..20352f8 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 a79dfa6..61dc03a 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 0fdc8e5..51d42c2 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ