Prevent false positive between inetd and xinetd

1 files changed, 41 insertions, 41 deletions

diff --git a/include/tests_insecure_services b/include/tests_insecure_services
index 8beb913f..8e5e1b8e 100644
--- a/include/tests_insecure_services
+++ b/include/tests_insecure_services
@@ -31,18 +31,18 @@
     # Description : Check for inetd status
     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..."
-	FIND=`${PSBINARY} ax | grep "inetd" | grep -v "grep"`
-	if [ ! "${FIND}" = "" ]; then
-	    logtext "Result: inetd is running"
-	    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
-	fi
+        # Check running processes
+        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
+            #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
+        fi
     fi
 #
 #################################################################################
@@ -52,17 +52,17 @@
     if [ ${INETD_ACTIVE} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
     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}..."
-	if [ -f ${INETD_CONFIG_FILE} ]; then
-	    logtext "Result: ${INETD_CONFIG_FILE} exists"
-	    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
-	fi
-	# YYY immutable bit could be set
-	# YYY permission check (already set in profile)
+        # Check configuration 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
+          else
+            logtext "Result: ${INETD_CONFIG_FILE} does not exist"
+            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)
     fi
 #
 #################################################################################
@@ -70,17 +70,17 @@
     # Test        : INSE-8006
     # Description : Check for inetd configuration file contents if inetd is NOT active
     if [ ${INETD_ACTIVE} -eq 0 -a -f ${INETD_CONFIG_FILE} ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
-    Register --test-no INSE-8006 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check for disabled inet daemon"
+    Register --test-no INSE-8006 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check configuration of inetd when disabled"
     if [ ${SKIPTEST} -eq 0 ]; then
-	# Check if any service is enabled in /etc/inetd.conf (inetd is not active, see test 8002)
-	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
-	  else
-	    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
+        # Check if any service is enabled in /etc/inetd.conf (inetd is not active, see test 8002)
+        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
+          else
+            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
 #
 #################################################################################
@@ -90,14 +90,14 @@
     if [ ${INETD_ACTIVE} -eq 1 -a -f ${INETD_CONFIG_FILE} ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
     Register --test-no INSE-8016 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check for telnet via inetd"
     if [ ${SKIPTEST} -eq 0 ]; then
-	logtext "Test: checking telnet presence in inetd configuration"
-	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 FOUND --color GREEN
-	  else
-	    logtext "Result: telnet enabled in ${INETD_CONFIG_FILE}"
-	    Display --indent 2 --text "- Checking inetd (telnet)..." --result WARNING --color RED
+        logtext "Test: checking telnet presence in inetd configuration"
+        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 FOUND --color GREEN
+          else
+            logtext "Result: telnet enabled in ${INETD_CONFIG_FILE}"
+            Display --indent 2 --text "- Checking inetd (telnet)..." --result WARNING --color RED
         fi
     fi
 #