[checkmk-commits] Check_MK Git: check_mk: winperf_counters: now able to handle counter names containing an :

Module: check_mk Branch: master Commit: bf9f4c00b1cd8a4ec81baa8e04bbcf659619d831 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf9f4c00b1cd8a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 19 11:19:38 2014 +0200 winperf_counters: now able to handle counter names containing an : --- 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 -> 177664 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 178176 -> 177664 bytes agents/windows/install_agent-64.exe | Bin 159871 -> 159871 bytes agents/windows/install_agent.exe | Bin 156784 -> 156806 bytes 8 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 60d3b2f..98d9bcb 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -15 +17 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 7e7f6ed..38e5220 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 66519d7..00cc87f 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 bf03297..908a28f 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -3785,7 +3785,7 @@ bool handle_global_config_variable(char *var, char *value) bool handle_winperf_config_variable(char *var, char *value) { if (!strcmp(var, "counters")) { - char *colon = strchr(value, ':'); + char *colon = strrchr(value, ':'); if (!colon) { fprintf(stderr, "Invalid counter '%s' in section [winperf]: need number(or text) and colon, e.g. 238:processor.\n", value); exit(1); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 66fb39b..a87a33b 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 d22914e..9dc34b5 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 e21840f..86342aa 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 fc24dba..53d1127 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ