From 2530256d855f1230be6bb2dad09478d413c3c21f Mon Sep 17 00:00:00 2001 From: mboelen Date: Fri, 19 Sep 2014 02:02:22 +0200 Subject: [PATCH] Small textual replacements for logging purposes --- include/tests_authentication | 2 +- include/tests_kernel | 2 +- include/tests_ports_packages | 4 ++-- include/tests_snmp | 2 +- include/tests_squid | 2 +- include/tests_ssh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/tests_authentication b/include/tests_authentication index 7f74e6dc..b96d0284 100644 --- a/include/tests_authentication +++ b/include/tests_authentication @@ -62,7 +62,7 @@ if [ ${SKIPTEST} -eq 0 ]; then logtext "Test: ${USER_PASSWD_DOUBLEUID_AUDIT_TITLE}" logtext "Description: ${USER_PASSWD_DOUBLEUID_AUDIT_DESCRIPTION}" - logtext "Action: Checking for non-unique accounts" + logtext "Test: Checking for non-unique accounts" if [ "${OS}" = "DragonFly" -o "${OS}" = "FreeBSD" -o "${OS}" = "NetBSD" ]; then PASSWD_FILE="/etc/master.passwd" else diff --git a/include/tests_kernel b/include/tests_kernel index 69f975d1..195a5367 100644 --- a/include/tests_kernel +++ b/include/tests_kernel @@ -272,7 +272,7 @@ Display --indent 2 --text "- Checking active kernel modules" logtext "Test: ${KERNEL_ACTIVE_MODULES_TITLE}" logtext "Description: ${KERNEL_ACTIVE_MODULES_DESCRIPTION}" - logtext "Action: Checking modules" + logtext "Test: Checking modules" if [ -f /sbin/kldstat ]; then FIND=`kldstat | grep -v 'Name' | tr -s ' ' | cut -d ' ' -f6` if [ $? -eq 0 ]; then diff --git a/include/tests_ports_packages b/include/tests_ports_packages index f4d2680c..f130715c 100644 --- a/include/tests_ports_packages +++ b/include/tests_ports_packages @@ -669,12 +669,12 @@ logtext "Action: updating repository with apt-get" /usr/bin/apt-get -q=2 update logtext "Result: apt-get finished" - logtext "Action: Checking if /usr/lib/update-notifier/apt-check exists" + logtext "Test: Checking if /usr/lib/update-notifier/apt-check exists" if [ -x /usr/lib/update-notifier/apt-check ]; then PKG_AUDIT_TOOL_FOUND=1 PKG_AUDIT_TOOL="apt-check" logtext "Result: found /usr/lib/update-notifier/apt-check" - logtext "Action: checking if any of the updates contain security updates" + logtext "Test: checking if any of the updates contain security updates" # apt-check binary is a script and translated. Do not search for normal text strings, but use numbered output only FIND=`/usr/lib/update-notifier/apt-check 2>&1 | awk -F\; '{ print $2 }'` # Check if we get the proper line back and amount of security patches available diff --git a/include/tests_snmp b/include/tests_snmp index e05a9bf1..c7596d45 100644 --- a/include/tests_snmp +++ b/include/tests_snmp @@ -50,7 +50,7 @@ if [ ${SNMP_DAEMON_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no SNMP-3304 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check SNMP daemon file location" if [ ${SKIPTEST} -eq 0 ]; then - logtext "Action: searching for snmpd.conf file" + logtext "Test: searching for snmpd.conf file" for I in ${SNMP_DAEMON_CONFIG_LOCS}; do if [ -f "${I}/snmpd.conf" ]; then logtext "Result: ${I}/snmpd.conf exists" diff --git a/include/tests_squid b/include/tests_squid index 27b1af42..b9305f9e 100644 --- a/include/tests_squid +++ b/include/tests_squid @@ -56,7 +56,7 @@ if [ ${SQUID_DAEMON_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no SQD-3604 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check Squid daemon file location" if [ ${SKIPTEST} -eq 0 ]; then - logtext "Action: searching for squid.conf or squid3.conf file" + logtext "Test: searching for squid.conf or squid3.conf file" for I in ${SQUID_DAEMON_CONFIG_LOCS}; do # Checking squid.conf if [ -f "${I}/squid.conf" ]; then diff --git a/include/tests_ssh b/include/tests_ssh index 84fc1239..2d2029e6 100644 --- a/include/tests_ssh +++ b/include/tests_ssh @@ -51,7 +51,7 @@ Register --test-no SSH-7404 --preqs-met ${PREQS_MET} --weight L --network NO --description "Check SSH daemon file location" if [ ${SKIPTEST} -eq 0 ]; then FOUND=0 - logtext "Action: searching for sshd_config file" + logtext "Test: searching for sshd_config file" for I in ${SSH_DAEMON_CONFIG_LOCS}; do if [ -f "${I}/sshd_config" ]; then logtext "Result: ${I}/sshd_config exists"