Module: check_mk Branch: master Commit: f43680f8c25c0984ebb4d2101515445ef136c7c9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f43680f8c25c09… Author: Sebastian Herbord &lt;sh(a)mathias-kettner.de&gt; Date: Mon Feb 1 15:15:40 2016 +0100 #3063 FIX mcaffee_av_client: plugin didn't work with 32-bit av software installed on 64-bit system --- .werks/3063 | 9 +++++++++ ChangeLog | 1 + agents/windows/plugins/mcafee_av_client.bat | 7 ++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.werks/3063 b/.werks/3063 new file mode 100644 index 0000000..49af189 --- /dev/null +++ b/.werks/3063 @@ -0,0 +1,9 @@ +Title: mcaffee_av_client: plugin didn't work with 32-bit av software installed on 64-bit system +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1454336076 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 81f2c89..ebc4cc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -236,6 +236,7 @@ * 2940 FIX: dell_om_disks: non-raid state is no longer treated as a critical problem... * 2942 FIX: juniper_cpu_util: new check replaces juniper_cpu which was reporting incorrect values... NOTE: Please refer to the migration notes! + * 3063 FIX: mcaffee_av_client: plugin didn't work with 32-bit av software installed on 64-bit system Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/windows/plugins/mcafee_av_client.bat b/agents/windows/plugins/mcafee_av_client.bat index ee324c2..d5376b9 100644 --- a/agents/windows/plugins/mcafee_av_client.bat +++ b/agents/windows/plugins/mcafee_av_client.bat @@ -8,7 +8,12 @@ rem # ------------------------------------------------------------------------- setlocal enableDelayedExpansion set dateval= -for /f "tokens=3" %%a in ('reg query "HKLM\SOFTWARE\McAfee\AvEngine" ^|find "AVDatDate" ^|find "REG_SZ"') do @set dateval=%%a +for /f "tokens=3" %%a in ('reg query "HKLM\SOFTWARE\McAfee\AvEngine" ^|find /I "AVDatDate" ^|find "REG_SZ"') do @set dateval=%%a +if "%dateval%"=="" ( + rem # on 64 bit systems the registry key is in the wow64/32 branch + for /f "tokens=3" %%a in ('reg query "HKLM\SOFTWARE\Wow6432Node\McAfee\AvEngine" ^|find /I "AVDatDate" ^|find "REG_SZ"') do @set dateval=%%a +) + if not "%dateval%"=="" ( echo ^<^<^<mcafee_av_client^>^>^> echo %dateval%