Merge branch 'master' of https://github.com/CISOfy/lynis

default.prf

@@ -39,7 +39,7 @@ language=
 # Lynis Enterprise license key
 license-key=
 
-# Defines the role of the system (desktop, server)
+# Defines the role of the system (personal, workstation or server)
 machine-role=server
 
 # Profile name, will be used as title/description

include/profiles

@@ -174,10 +174,10 @@
                     LOG_INCORRECT_OS=${SETTING_LOG_TESTS_INCORRECT_OS}
                 ;;
 
-                # What type of machine we are scanning (eg. desktop, server, server with storage)
+                # What type of machine we are scanning (eg. personal, workstation or server)
                 machine-role | machine_role)
                     MACHINE_ROLE="${VALUE}"
-                    AddSetting "machine-role" "${MACHINE_ROLE}" "Machine role (server or desktop)"
+                    AddSetting "machine-role" "${MACHINE_ROLE}" "Machine role (personal, workstation or server)"
                 ;;
 
                 # Define if any found NTP daemon instance is configured as a server or client

include/tests_hardening

@@ -105,9 +105,15 @@
             AddHP 3 3
         else
             LogText "Result: no malware scanner found"
+            if [$MACHINE_ROLE = "personal"]; then
+              Display --indent 4 --text "- Installed malware scanner" --result "${STATUS_NOT_FOUND}" --color YELLOW
+            else
+              Display --indent 4 --text "- Installed malware scanner" --result "${STATUS_NOT_FOUND}" --color RED
+            fi
             Display --indent 4 --text "- Installed malware scanner" --result "${STATUS_NOT_FOUND}" --color RED
             ReportSuggestion ${TEST_NO} "Harden the system by installing at least one malware scanner, to perform periodic file system scans" "-" "Install a tool like rkhunter, chkrootkit, OSSEC"
             AddHP 1 3
+            LogText "Result: no malware scanner found"
         fi
     fi
 #

include/tests_networking

@@ -574,7 +574,7 @@
     # Description : Checking for DHCP client
     Register --test-no NETW-3030 --weight L --network NO --category security --description "Checking DHCP client status"
     if [ ${SKIPTEST} -eq 0 ]; then
-        IsRunning dhclient
+        IsRunning dhclient || IsRunning dhcpd
         if [ ${RUNNING} -eq 1 ]; then
             Display --indent 2 --text "- Checking status DHCP client" --result "${STATUS_RUNNING}" --color WHITE
             DHCP_CLIENT_RUNNING=1