Rename of categories, introduction of groups

1 files changed, 12 insertions, 4 deletions

diff --git a/lynis b/lynis
index 6d06e710..2e29608e 100755
--- a/lynis
+++ b/lynis
@@ -510,6 +510,8 @@ ${NORMAL}
         LogText "Info: could not find a hostname, using 'no-hostname' instead"
         ReportSuggestion "LYNIS" "Check your hostname configuration" "hostname -s"
     fi
+    Report "test_category=${TEST_CATEGORY_TO_CHECK}"
+    Report "test_group=${TEST_GROUP_TO_CHECK}"
 #
 #################################################################################
 #
@@ -578,13 +580,17 @@ ${NORMAL}
         echo "  Kernel version:            ${OS_KERNELVERSION}"
         echo "  Hardware platform:         ${HARDWARE}"
         echo "  Hostname:                  ${HOSTNAME}"
-        echo "  Auditor:                   ${AUDITORNAME}"
+        echo "  ---------------------------------------------------"
         echo "  Profiles:                  ${PROFILES}"
         echo "  Log file:                  ${LOGFILE}"
         echo "  Report file:               ${REPORTFILE}"
         echo "  Report version:            ${REPORT_version}"
         echo "  Plugin directory:          ${PLUGINDIR}"
         echo "  ---------------------------------------------------"
+        echo "  Auditor:                   ${AUDITORNAME}"
+        echo "  Test category:             ${TEST_CATEGORY_TO_CHECK}"
+        echo "  Test group:                ${TEST_GROUP_TO_CHECK}"
+        echo "  ---------------------------------------------------"
     fi
 
     LogText "Program version:           ${PROGRAM_VERSION}"
@@ -609,6 +615,8 @@ ${NORMAL}
     LogText "Report file:               ${REPORTFILE}"
     LogText "Report version:            ${REPORT_version}"
     LogText "-----------------------------------------------------"
+    LogText "Test category:             ${TEST_CATEGORY_TO_CHECK}"
+    LogText "Test group:                ${TEST_GROUP_TO_CHECK}"
     LogText "BusyBox used:              ${SHELL_IS_BUSYBOX}"
 
     Report "plugin_directory=${PLUGINDIR}"
@@ -860,7 +868,7 @@ ${NORMAL}
 
         LogTextBreak
         # Test sections
-        if [ "${TESTS_CATEGORY_TO_PERFORM}" = "" ]; then
+        if [ "${TEST_GROUP_TO_CHECK}" = "all" ]; then
             LogText "Info: perform tests from all categories"
 
             INCLUDE_TESTS="boot_services kernel memory_processes authentication shells \
@@ -870,8 +878,8 @@ ${NORMAL}
                            mac_frameworks file_integrity tooling malware file_permissions homedirs \
                            kernel_hardening hardening"
           else
-            INCLUDE_TESTS="${TESTS_CATEGORY_TO_PERFORM}"
-            LogText "Info: only performing tests from categories: ${TESTS_CATEGORY_TO_PERFORM}"
+            INCLUDE_TESTS="${TEST_GROUP_TO_CHECK}"
+            LogText "Info: only performing tests from groups: ${TEST_GROUP_TO_CHECK}"
         fi
 
         # Include available tests