[checkmk-commits] 3815 FIX windows_agent: fixed incorrect parsing of only_from parameter

Module: check_mk Branch: master Commit: 96bbc5fa2fc051753a728a7001336fb6a12ac987 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96bbc5fa2fc051… Author: Andreas Boesl &lt;ab(a)mathias-kettner.de&gt; Date: Thu Sep 29 12:22:42 2016 +0200 3815 FIX windows_agent: fixed incorrect parsing of only_from parameter only_from needs to be configured like this: only_from = 127.0.0.1 191.15.12.23 10.1.1.139 --- .werks/3815 | 11 +++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1323008 -> 1324544 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15346336 -> 15365686 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1323008 -> 1324544 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 1297408 -> 1299456 bytes agents/windows/check_mk_agent.msi | Bin 2890240 -> 2893824 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13270746 -> 13295415 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1297408 -> 1299456 bytes agents/windows/install_agent-64.exe | Bin 584188 -> 584735 bytes agents/windows/install_agent.exe | Bin 580926 -> 581433 bytes agents/windows/sections/SectionCheckMK.h | 2 +- 14 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/3815 b/.werks/3815 new file mode 100644 index 0000000..85af9b0 --- /dev/null +++ b/.werks/3815 @@ -0,0 +1,11 @@ +Title: windows_agent: fixed incorrect parsing of only_from parameter +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i1 +Date: 1475144502 +Class: fix + +only_from needs to be configured like this: + +only_from = 127.0.0.1 191.15.12.23 10.1.1.139 diff --git a/ChangeLog b/ChangeLog index 58adf3b..4755c6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -416,6 +416,7 @@ * 3890 FIX: check_mk_agent.openbsd: Fixed broken MRPE checks * 3814 FIX: win_netstat: fixed unicode warning while parsing data * 3880 FIX: check_sql: fixed missing number in check details + * 3815 FIX: windows_agent: fixed incorrect parsing of only_from parameter... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/build_version b/agents/windows/build_version index cf7d7d1..6fce670 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2087 +2103 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 9c7f963..aec1135 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 bea4148..9d5ab34 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 529be0c..aa8daf5 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 68f7710..119bff1 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -160,7 +160,7 @@ struct GlobalConfig { Configurable<bool> encrypted_rt; Configurable<bool> support_ipv6; Configurable<std::string> passphrase; - ListConfigurable<only_from_t, BlockMode::FileExclusive<only_from_t>> + SplittingListConfigurable<only_from_t, BlockMode::FileExclusive<only_from_t>> only_from; GlobalConfig(const Environment &env) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 7b6af7b..5e20dcf 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 93699a4..48608e1 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 32c613b..14507a0 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 4344e08..2b73072 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 b1002c8..484b236 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 d671fa7..ac7994f 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/sections/SectionCheckMK.h b/agents/windows/sections/SectionCheckMK.h index 457d39d..b55dca2 100644 --- a/agents/windows/sections/SectionCheckMK.h +++ b/agents/windows/sections/SectionCheckMK.h @@ -32,7 +32,7 @@ class Environment; class SectionCheckMK : public Section { Configurable<bool> _crash_debug; - ListConfigurable<only_from_t, BlockMode::FileExclusive<only_from_t>> + SplittingListConfigurable<only_from_t, BlockMode::FileExclusive<only_from_t>> _only_from; typedef std::pair<const char *, std::string> KVPair;