Optimizing code, cleaning up

This commit is contained in:
mboelen 2015-07-22 12:20:03 +02:00
parent 6857f01500
commit e06d706c83

View File

@ -14,7 +14,8 @@
# #
################################################################################# #################################################################################
# #
# Check which tools are installed # * Check which binaries and tools are installed
# * With the results a customized scan can be performed for every single system.
# #
################################################################################# #################################################################################
# #
@ -25,19 +26,14 @@
################################################################################# #################################################################################
# #
if [ ${CHECK_BINARIES} -eq 1 ]; then if [ ${CHECK_BINARIES} -eq 1 ]; then
InsertSection "System Tools" InsertSection "System Tools"
# Display --indent 2 --text "- Scanning available tools..."
################################################################################# logtext "Start scanning for available audit binaries and tools..."
#
Display --indent 2 --text "- Scanning available tools..." # Test : FILE-7502
logtext "Start scanning for available audit binaries and tools..." # Description : Check all system binaries
# Notes : Always perform test, dependency for many other tests
# Test : FILE-7502 Register --test-no FILE-7502 --weight L --network NO --description "Check all system binaries"
# Description : Check all system binaries
# Notes : Always perform test, dependency for many other tests
Register --test-no FILE-7502 --weight L --network NO --description "Check all system binaries"
#if [ ${SKIPTEST} -eq 0 ]; then
BINARY_PATHS_FOUND=""; N=0 BINARY_PATHS_FOUND=""; N=0
Display --indent 2 --text "- Checking system binaries..." Display --indent 2 --text "- Checking system binaries..."
logtext "Status: Starting binary scan..." logtext "Status: Starting binary scan..."
@ -206,13 +202,11 @@
logtext "Discovered directories: ${BINARY_PATHS_FOUND}" logtext "Discovered directories: ${BINARY_PATHS_FOUND}"
report "binary_paths=${BINARY_PATHS_FOUND}" report "binary_paths=${BINARY_PATHS_FOUND}"
BINARY_SCAN_FINISHED=1 BINARY_SCAN_FINISHED=1
#fi logtext "Result: found ${N} binaries"
report "binaries_count=${N}"
logtext "Result: found ${N} binaries"
report "binaries_count=${N}"
else else
logtext "Result: checking binaries skipped in this mode" logtext "Result: checking of binaries skipped in this mode"
fi fi
# #