Module: check_mk Branch: master Commit: 12049a940ed766aed49246f70c1b72f9953b8888 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=12049a940ed766… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Jul 28 13:09:31 2015 +0200 #1275 FIX Fileinfo: Fixed handling of output from AIX Agent --- .werks/1275 | 10 ++++++++++ ChangeLog | 1 + checks/fileinfo | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1275 b/.werks/1275 new file mode 100644 index 0000000..c561158 --- /dev/null +++ b/.werks/1275 @@ -0,0 +1,10 @@ +Title: Fileinfo: Fixed handling of output from AIX Agent +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i3 +Date: 1438081722 + + diff --git a/ChangeLog b/ChangeLog index b3cf5cf..31f2687 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,7 @@ * 2498 FIX: livestatus_status: Records the number of hosts/services now * 2489 FIX: cmciii_lcp_water: New check replacing cmciii_lcp_waterin/out, support for newer devices... NOTE: Please refer to the migration notes! + * 1275 FIX: Fileinfo: Fixed handling of output from AIX Agent Multisite: * 2385 SEC: Fixed possible reflected XSS on all GUI pages where users can produce unhandled exceptions... diff --git a/checks/fileinfo b/checks/fileinfo index e8cf6e2..ba91896 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -172,7 +172,7 @@ def check_fileinfo_groups(item, params, info): # endswith("No such file...") is needed to # support the solaris perl based version of fileinfo if not line[0].endswith("No such file or directory") \ - and fnmatch.fnmatch(line[0], inclusion) and str(line[1]) != 'missing' \ + and fnmatch.fnmatch(line[0], inclusion) and str(line[1]) not in ['missing',''] \ and not fnmatch.fnmatch(line[0], exclusion): size = int(line[1]) size_all += size