Module: check_mk
Branch: master
Commit: 53c45bfc02d2d7c232ce1bf96d8e61f6f4fa3e72
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=53c45bfc02d2d7…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Jul 31 10:56:01 2012 +0200
FIX: windows agent: try to fix crash in event log handling
---
ChangeLog | 1 +
agents/windows/check_mk_agent.cc | 8 +++++---
agents/windows/check_mk_agent.exe | Bin 105472 -> 105472 bytes
agents/windows/install_agent.exe | Bin 126273 -> 126266 bytes
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 71a8917..a7fb697 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,7 @@
* cbl_airlaser.status: New Check for CBL Airlaser IP1000 laser bridge.
* df, hr_fs, etc.: Filesystem checks now support grouping (pools)
Please refer to the check manpage of df for details
+ * FIX: windows agent: try to fix crash in event log handling
WATO:
* Added permission to control the "clone host" feature in WATO
diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc
index 0b2a3ea..7e20554 100755
--- a/agents/windows/check_mk_agent.cc
+++ b/agents/windows/check_mk_agent.cc
@@ -907,11 +907,13 @@ bool output_eventlog_entry(SOCKET &out, char *dllpath,
EVENTLOGRECORD *event, ch
dll = NULL;
WCHAR wmsgbuffer[2048];
+ DWORD dwFlags = FORMAT_MESSAGE_ARGUMENT_ARRAY | FORMAT_MESSAGE_FROM_SYSTEM;
+ if (dll)
+ dwFlags |= FORMAT_MESSAGE_FROM_HMODULE;
+
DWORD len = FormatMessageW(
// DWORD len = FormatMessage(
- FORMAT_MESSAGE_ARGUMENT_ARRAY |
- FORMAT_MESSAGE_FROM_HMODULE |
- FORMAT_MESSAGE_FROM_SYSTEM,
+ dwFlags,
dll,
event->EventID,
0, // accept any language
diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe
index 8d3f956..539941a 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 3286f34..c98e6ff 100755
Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe
differ