Module: check_mk Branch: master Commit: d0a8fdcf8ddfdb7e3eb498a9ca4ad8a5598fdd5c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0a8fdcf8ddfdb… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Tue Oct 28 13:48:08 2014 +0100 #1426 FIX windows agent: logwatch: no longer reports incorrect formatted texts (japanese characters) Sometimes the windows agent read error texts out of dll files. Most dll files were prefixed with <tt>%SystemRoot%</tt> which gets replaced by the real path. However, there were instances were the prefix was <tt>%windir%</tt>. This placeholder was not replaced correctly. As a result the dll were not found, which lead to incorrect formatted texts. --- .werks/1426 | 14 ++++++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent.cc | 2 ++ agents/windows/check_mk_agent.exe | Bin 178176 -> 178176 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 178176 -> 178176 bytes agents/windows/install_agent-64.exe | Bin 160117 -> 160293 bytes agents/windows/install_agent.exe | Bin 157057 -> 157222 bytes 10 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/1426 b/.werks/1426 new file mode 100644 index 0000000..4c33031 --- /dev/null +++ b/.werks/1426 @@ -0,0 +1,14 @@ +Title: windows agent: logwatch: no longer reports incorrect formatted texts (japanese characters) +Level: 1 +Component: core +Compatible: compat +Version: 1.2.5i6 +Date: 1414500095 +Class: fix + +Sometimes the windows agent read error texts out of dll files. +Most dll files were prefixed with <tt>%SystemRoot%</tt> which gets replaced by the real path. + +However, there were instances were the prefix was <tt>%windir%</tt>. +This placeholder was not replaced correctly. As a result the dll were not found, +which lead to incorrect formatted texts. diff --git a/ChangeLog b/ChangeLog index af93fea..ca38465 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * 1373 SEC: Do not ouput complete command line when datasource programs fail... * 1425 New section header option "encoding" for agent output... * 1129 FIX: Windows MSI-Installer: some systems created corrupted check_mk_agent.msi files... + * 1426 FIX: windows agent: logwatch: no longer reports incorrect formatted texts (japanese characters)... Checks & Agents: * 0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices diff --git a/agents/windows/build_version b/agents/windows/build_version index 49541f7..f906e18 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -94 +96 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 0ed2329..dd9dad1 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 defdda0..d73c2bc 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 20b166a..fa6b383 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -1055,6 +1055,8 @@ bool output_eventlog_entry(SOCKET &out, char *dllpath, EVENTLOGRECORD *event, ch // but not entirely for sure - C:\WINDOWS if (strncasecmp(dllpath, "%SystemRoot%", 12) == 0) snprintf(dll_realpath, sizeof(dll_realpath), "%s%s", system_root(), dllpath + 12); + else if (strncasecmp(dllpath, "%windir%", 8) == 0) + snprintf(dll_realpath, sizeof(dll_realpath), "%s%s", system_root(), dllpath + 8); else snprintf(dll_realpath, sizeof(dll_realpath), "%s", dllpath); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index d088125..5ce8ccc 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.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 952b59f..6288309 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 64da341..6acaa93 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 0b5ede7..900fbaa 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ