diff options
| author | mboelen <michael@cisofy.com> | 2014-09-19 03:10:43 +0400 |
|---|---|---|
| committer | mboelen <michael@cisofy.com> | 2014-09-19 03:10:43 +0400 |
| commit | 805cdf6bf5ab235c5d42f25463136d93cd2bb9cf (patch) | |
| tree | 4a9fb2e3ad0d8ec2d77670d7c0562c7d101ce5de /include/tests_malware | |
| parent | cac6a8e438c3db074b4c9477387414802eb70887 (diff) | |
Generic code enhancements
Diffstat (limited to 'include/tests_malware')
| -rw-r--r-- | include/tests_malware | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/include/tests_malware b/include/tests_malware index 9a4e0944..9d231b03 100644 --- a/include/tests_malware +++ b/include/tests_malware @@ -119,8 +119,8 @@ Register --test-no MALW-3284 --weight L --network NO --description "Check for clamd" if [ ${SKIPTEST} -eq 0 ]; then logtext "Test: checking running ClamAV daemon (clamd)" - FIND=`${PSBINARY} ax | grep "/clamd" | grep -v "grep"` - if [ ! "${FIND}" = "" ]; then + IsRunning clamd + if [ ${RUNNING} -eq 1 ]; then Display --indent 2 --text "- Checking ClamAV daemon" --result "FOUND" --color GREEN logtext "Result: found running clamd process" MALWARE_SCANNER_INSTALLED=1 @@ -139,8 +139,8 @@ Register --test-no MALW-3286 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check for freshclam" if [ ${SKIPTEST} -eq 0 ]; then logtext "Test: checking running freshclam daemon" - FIND=`${PSBINARY} ax | grep "/freshclam" | grep -v "grep"` - if [ ! "${FIND}" = "" ]; then + IsRunning freshclam + if [ ${RUNNING} -eq 1 ]; then Display --indent 4 --text "- Checking freshclam" --result "FOUND" --color GREEN logtext "Result: found running freshclam process" AddHP 2 2 @@ -158,21 +158,20 @@ # ################################################################################# # - # Test : MALW-3292 # Description : Check if at least one malware scanner is installed # Register --test-no MALW-3292 --weight L --network NO --description "Check for at least one malware scanner" # if [ ${SKIPTEST} -eq 0 ]; then -# if [ ${MALWARE_SCANNER_INSTALLED} -eq 1 ]; then -# logtext "Result: At least one malware scanner is installed" -# Display --indent 2 --text "- Checking presence malware scanner" --result "FOUND" --color GREEN -# #AddHP 3 3 -# else -# logtext "Result: No malware scanners found" -# Display --indent 2 --text "- Checking presence malware scanner" --result "NOT FOUND" --color YELLOW -# ReportSuggestion ${TEST_NO} "Install at least one malware scanner to perform periodic integrity tests on the system" -# #AddHP 0 3 -# fi +# if [ ${MALWARE_SCANNER_INSTALLED} -eq 1 ]; then +# logtext "Result: At least one malware scanner is installed" +# Display --indent 2 --text "- Checking presence malware scanner" --result "FOUND" --color GREEN +# #AddHP 3 3 +# else +# logtext "Result: No malware scanners found" +# Display --indent 2 --text "- Checking presence malware scanner" --result "NOT FOUND" --color YELLOW +# ReportSuggestion ${TEST_NO} "Install at least one malware scanner to perform periodic integrity tests on the system" +# #AddHP 0 3 +# fi # fi # ################################################################################# |