Module: check_mk Branch: master Commit: f75dcdd1af39beb9c5237d1dc538afccef0e1e73 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f75dcdd1af39be… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed May 13 12:00:26 2015 +0200 windows agent: no longer SEGFAULTs when started as service or run from command line without arguments --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 301056 -> 301056 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 301056 -> 301056 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 182784 -> 182784 bytes agents/windows/check_mk_agent.msi | Bin 732160 -> 732160 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 182784 -> 182784 bytes agents/windows/install_agent-64.exe | Bin 178405 -> 178440 bytes agents/windows/install_agent.exe | Bin 159355 -> 159356 bytes 9 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index a2ecc45..91b629b 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -154 +156 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index ceea0fd..250c6b7 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 37e124e..88273ab 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 694ea22..ff245e9 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -5078,7 +5078,7 @@ int main(int argc, char **argv) osv.dwOSVersionInfoSize = sizeof(osv); GetVersionEx(&osv); - if (!strcmp(argv[1], "adhoc") || !strcmp(argv[1], "test")) + if (argc > 1 && (!strcmp(argv[1], "adhoc") || !strcmp(argv[1], "test"))) determine_directories(true /* use working dir */); else determine_directories(false /* use registered dir */); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 7d7387a..24cd874 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 fd48c86..3ad8ba1 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 f9f47f8..74d61a7 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 14cc188..c1d35b6 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 02aa8a6..607f59d 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ