diff options
author | mboelen <michael@cisofy.com> | 2014-09-15 14:01:09 +0400 |
---|---|---|
committer | mboelen <michael@cisofy.com> | 2014-09-15 14:01:09 +0400 |
commit | c9fde8c2d11744cc0875bc3e5dd0abf096211755 (patch) | |
tree | 0997d08919db7ec4e2aa9065c3e9aaf1671c4d6f /include/tests_insecure_services | |
parent | 35d32fb5e40b86632677fd2256aebeddf926394a (diff) |
Code cleanup and small enhancements
Diffstat (limited to 'include/tests_insecure_services')
-rw-r--r-- | include/tests_insecure_services | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/tests_insecure_services b/include/tests_insecure_services index b0e6bae9..b55cfae6 100644 --- a/include/tests_insecure_services +++ b/include/tests_insecure_services @@ -32,16 +32,16 @@ Register --test-no INSE-8002 --weight L --network NO --description "Check for enabled inet daemon" if [ ${SKIPTEST} -eq 0 ]; then # Check running processes - logtext "Test: Searching for active inet daemon..." + logtext "Test: Searching for active inet daemon" IsRunning inetd if [ ${RUNNING} -eq 1 ]; then logtext "Result: inetd is running" - Display --indent 2 --text "- Checking inetd status..." --result ACTIVE --color GREEN + Display --indent 2 --text "- Checking inetd status" --result ACTIVE --color GREEN #YYY perform manual check INETD_ACTIVE=1 else logtext "Result: inetd is NOT running" - Display --indent 2 --text "- Checking inetd status..." --result "NOT ACTIVE" --color GREEN + Display --indent 2 --text "- Checking inetd status" --result "NOT ACTIVE" --color GREEN fi fi # @@ -53,13 +53,13 @@ Register --test-no INSE-8004 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check for enabled inet daemon" if [ ${SKIPTEST} -eq 0 ]; then # Check configuration file - logtext "Test: Searching for file ${INETD_CONFIG_FILE}..." + logtext "Test: Searching for file ${INETD_CONFIG_FILE}" if [ -f ${INETD_CONFIG_FILE} ]; then logtext "Result: ${INETD_CONFIG_FILE} exists" - Display --indent 4 --text "- Checking inetd.conf..." --result FOUND --color WHITE + Display --indent 4 --text "- Checking inetd.conf" --result FOUND --color WHITE else logtext "Result: ${INETD_CONFIG_FILE} does not exist" - Display --indent 4 --text "- Checking inetd.conf..." --result "NOT FOUND" --color WHITE + Display --indent 4 --text "- Checking inetd.conf" --result "NOT FOUND" --color WHITE fi # YYY immutable bit could be set # YYY permission check (already set in profile) @@ -76,9 +76,9 @@ logtext "Test: check if all services are disabled if inetd is disabled" FIND=`cat ${INETD_CONFIG_FILE} | grep -v "^#" | grep -v "^$"` if [ "${FIND}" = "" ]; then - Display --indent 4 --text "- Checking inetd.conf services..." --result OK --color GREEN + Display --indent 4 --text "- Checking inetd.conf services" --result OK --color GREEN else - Display --indent 4 --text "- Checking inetd.conf services..." --result SUGGESTION --color YELLOW + Display --indent 4 --text "- Checking inetd.conf services" --result SUGGESTION --color YELLOW ReportSuggestion ${TEST_NO} "Although inetd is not running, make sure no services are enabled in ${INETD_CONFIG_FILE}" fi fi @@ -94,11 +94,11 @@ FIND=`grep "^telnet" ${INETD_CONFIG_FILE}` if [ "${FIND}" = "" ]; then logtext "Result: telnet not enabled in ${INETD_CONFIG_FILE}" - Display --indent 2 --text "- Checking inetd (telnet)..." --result "NOT FOUND" --color GREEN + Display --indent 2 --text "- Checking inetd (telnet)" --result "NOT FOUND" --color GREEN AddHP 3 3 else logtext "Result: telnet enabled in ${INETD_CONFIG_FILE}" - Display --indent 2 --text "- Checking inetd (telnet)..." --result WARNING --color RED + Display --indent 2 --text "- Checking inetd (telnet)" --result WARNING --color RED ReportSuggestion "${TEST_NO}" "Disable telnet in inetd configuration and use SSH instead" AddHP 1 3 fi |