Module: check_mk
Branch: master
Commit: 79a806b521e6d2f4cf7fd165287a6f99391a82fb
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79a806b521e6d2…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Mon Jul 10 11:49:12 2017 +0200
4845 FIX Windows Agent / Fileinfo: now able to read files meta information (size, age)
even when file is locked
Change-Id: Ibb0aa7880525091dab3ceef05efea1c068accc6a
---
.werks/4845 | 10 ++++++++++
agents/windows/build_version | 2 +-
agents/windows/check_mk_agent-64.exe | Bin 1340416 -> 1340416 bytes
agents/windows/check_mk_agent-64.unstripped.exe | Bin 15823789 -> 15823789 bytes
agents/windows/check_mk_agent-64.unversioned.exe | Bin 1340416 -> 1340416 bytes
agents/windows/check_mk_agent.exe | Bin 1318400 -> 1318400 bytes
agents/windows/check_mk_agent.msi | Bin 2928640 -> 2928640 bytes
agents/windows/check_mk_agent.unstripped.exe | Bin 13682205 -> 13682205 bytes
agents/windows/check_mk_agent.unversioned.exe | Bin 1318400 -> 1318400 bytes
agents/windows/crash.exe | Bin 101624 -> 101624 bytes
agents/windows/install_agent-64.exe | Bin 591911 -> 591914 bytes
agents/windows/install_agent.exe | Bin 589544 -> 589544 bytes
agents/windows/nowin.exe | Bin 103760 -> 103760 bytes
agents/windows/plugins/mk_jolokia.exe | Bin 10106761 -> 10106761 bytes
agents/windows/sections/SectionFileinfo.cc | 2 +-
15 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/.werks/4845 b/.werks/4845
new file mode 100644
index 0000000..24411db
--- /dev/null
+++ b/.werks/4845
@@ -0,0 +1,10 @@
+Title: Windows Agent / Fileinfo: now able to read files meta information (size, age) even
when file is locked
+Level: 1
+Component: checks
+Compatible: compat
+Edition: cre
+Version: 1.5.0i1
+Date: 1499679986
+Class: fix
+
+
diff --git a/agents/windows/build_version b/agents/windows/build_version
index 295764c..70142a5 100644
--- a/agents/windows/build_version
+++ b/agents/windows/build_version
@@ -1 +1 @@
-2836
+2838
diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe
index 4c75bb0..056374b 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.unstripped.exe
b/agents/windows/check_mk_agent-64.unstripped.exe
index fe982f8..3b9865f 100755
Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and
b/agents/windows/check_mk_agent-64.unstripped.exe differ
diff --git a/agents/windows/check_mk_agent-64.unversioned.exe
b/agents/windows/check_mk_agent-64.unversioned.exe
index c3d42ad..25ebfa6 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.exe b/agents/windows/check_mk_agent.exe
index 7a9e5d3..d32b0b2 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 9ce298d..b65283f 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.unstripped.exe
b/agents/windows/check_mk_agent.unstripped.exe
index 909710a..55f6945 100755
Binary files a/agents/windows/check_mk_agent.unstripped.exe and
b/agents/windows/check_mk_agent.unstripped.exe differ
diff --git a/agents/windows/check_mk_agent.unversioned.exe
b/agents/windows/check_mk_agent.unversioned.exe
index 5552095..4dfd3b0 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 94ff8c7..e08ac78 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 e123e9c..cb37a54 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 382e26f..dca8f40 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 a9cca69..f1b8248 100755
Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ
diff --git a/agents/windows/plugins/mk_jolokia.exe
b/agents/windows/plugins/mk_jolokia.exe
index b39cc0d..fde7dc3 100755
Binary files a/agents/windows/plugins/mk_jolokia.exe and
b/agents/windows/plugins/mk_jolokia.exe differ
diff --git a/agents/windows/sections/SectionFileinfo.cc
b/agents/windows/sections/SectionFileinfo.cc
index 2ffc2e4..13db252 100644
--- a/agents/windows/sections/SectionFileinfo.cc
+++ b/agents/windows/sections/SectionFileinfo.cc
@@ -141,7 +141,7 @@ void SectionFileinfo::outputFileinfos(std::ostream &out, const
char *path) {
}
bool SectionFileinfo::outputFileinfo(std::ostream &out, const std::string filename)
{
- auto hFile = std::make_unique<ManagedHandle>(CreateFile(filename.c_str(),
GENERIC_READ, FILE_SHARE_READ, NULL,
+ auto hFile = std::make_unique<ManagedHandle>(CreateFile(filename.c_str(), 0,
FILE_SHARE_READ, NULL,
OPEN_EXISTING, 0, NULL));
FILETIME ftCreate, ftAccess, ftWrite;