From e06d706c837977f50d2ed93f7827c5595e9dbe79 Mon Sep 17 00:00:00 2001
From: mboelen <michael@cisofy.com>
Date: Wed, 22 Jul 2015 12:20:03 +0200
Subject: [PATCH] Optimizing code, cleaning up

---
 include/binaries | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/include/binaries b/include/binaries
index e2569613..ab8f67fe 100644
--- a/include/binaries
+++ b/include/binaries
@@ -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
-    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..."
-    logtext "Start scanning for available audit binaries and tools..."
-
-    # Test        : FILE-7502
-    # 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
+        # Test        : FILE-7502
+        # 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"
         BINARY_PATHS_FOUND=""; N=0
         Display --indent 2 --text "- Checking system binaries..."
         logtext "Status: Starting binary scan..."
@@ -206,13 +202,11 @@
         logtext "Discovered directories: ${BINARY_PATHS_FOUND}"
         report "binary_paths=${BINARY_PATHS_FOUND}"
         BINARY_SCAN_FINISHED=1
-    #fi
-
-    logtext "Result: found ${N} binaries"
-    report "binaries_count=${N}"
+        logtext "Result: found ${N} binaries"
+        report "binaries_count=${N}"
 
       else
-        logtext "Result: checking binaries skipped in this mode"
+        logtext "Result: checking of binaries skipped in this mode"
     fi
 
 #