diff options
| author | mboelen <michael@cisofy.com> | 2015-07-22 17:28:11 +0300 |
|---|---|---|
| committer | mboelen <michael@cisofy.com> | 2015-07-22 17:28:11 +0300 |
| commit | 66fb36959339c2b6b4594ca11ffdb0e279164e50 (patch) | |
| tree | 11c7135141b4933dd7b8a0a7f1558d4ca757a76d /include/tests_malware | |
| parent | 1775590ba70ce52d6362141e395ecc1e80ddc4fa (diff) | |
Copyright line changes and cleanups
Diffstat (limited to 'include/tests_malware')
| -rw-r--r-- | include/tests_malware | 40 |
1 files changed, 14 insertions, 26 deletions
diff --git a/include/tests_malware b/include/tests_malware index 2fe22ba1..1462646c 100644 --- a/include/tests_malware +++ b/include/tests_malware @@ -5,8 +5,8 @@ # Lynis # ------------------ # -# Copyright 2007-2015, Michael Boelen (michael.boelen@cisofy.com), The Netherlands -# Web site: http://cisofy.com +# Copyright 2007-2015, Michael Boelen, CISOfy (michael.boelen@cisofy.com) +# Web site: https://cisofy.com # # Lynis comes with ABSOLUTELY NO WARRANTY. This is free software, and you are # welcome to redistribute it under the terms of the GNU General Public License. @@ -166,26 +166,20 @@ # ################################################################################# # -# Test : MALW-3288 -# Description : Check for ClamXav (Mac OS X) -# -################################################################################# -# - Register --test-no MALW-3288 --weight L --network NO --description "Check for ClamXav" + # Test : MALW-3288 + # Description : Check for ClamXav (Mac OS X) + if [ -d /Applications/ClamXav.app/Contents/Resources/ScanningEngine/bin/ ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi + Register --test-no MALW-3288 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check for ClamXav" if [ ${SKIPTEST} -eq 0 ]; then - if [ -d /Applications/ClamXav.app/Contents/Resources/ScanningEngine/bin/ ]; then - CLAMSCANBINARY=`ls /Applications/ClamXav.app/Contents/Resources/ScanningEngine/bin/ 2> /dev/null | grep 'clamscan'` - if [ ! "${CLAMSCANBINARY}" = "" ]; then - logtext "Result: Found ClamXav clamscan installed" - Display --indent 2 --text "- Checking presence of ClamXav AV scanner" --result "FOUND" --color GREEN - MALWARE_SCANNER_INSTALLED=1 - AddHP 3 3 - else - logtext "Result: ClamXav malware scanner not found" - AddHP 0 3 - fi + CLAMSCANBINARY=`ls /Applications/ClamXav.app/Contents/Resources/ScanningEngine/bin/ 2> /dev/null | grep 'clamscan'` + if [ ! "${CLAMSCANBINARY}" = "" ]; then + logtext "Result: Found ClamXav clamscan installed" + Display --indent 2 --text "- Checking presence of ClamXav AV scanner" --result "FOUND" --color GREEN + MALWARE_SCANNER_INSTALLED=1 + AddHP 3 3 else - logtext "Result: could not find ClamXav location" + logtext "Result: ClamXav malware scanner not found" + AddHP 0 3 fi fi # @@ -196,12 +190,6 @@ # ################################################################################# # -################################################################################# -# -# Other projects: maldetect (rfxn) -# -################################################################################# -# report "malware_scanner_installed=${MALWARE_SCANNER_INSTALLED}" |