Generic code enhancements

This commit is contained in:
mboelen 2014-09-19 01:07:34 +02:00
parent 94387348f0
commit cac6a8e438

View File

@ -114,8 +114,9 @@
Register --test-no ACCT-9628 --os Linux --weight L --network NO --description "Check for auditd"
if [ ${SKIPTEST} -eq 0 ]; then
logtext "Test: Check auditd status"
FIND=`${PSBINARY} ax | grep "auditd" | grep -v "grep" | grep -v "kauditd"`
if [ ! "${FIND}" = "" ]; then
# Should not get kauditd
IsRunning auditd
if [ ${RUNNING} -eq 1 ]; then
logtext "Result: auditd running"
Display --indent 2 --text "- Checking auditd" --result ENABLED --color GREEN
AUDITD_RUNNING=1
@ -218,8 +219,8 @@
Register --test-no ACCT-9650 --os Solaris --weight L --network NO --description "Check Solaris audit daemon"
if [ ${SKIPTEST} -eq 0 ]; then
logtext "Test: check if audit daemon is running"
FIND=`${PSBINARY} ax | grep "/auditd" | grep -v "grep"`
if [ ! "${FIND}" = "" ]; then
IsRunning auditd
if [ ${RUNNING} -eq 1 ]; then
logtext "Result: Solaris audit daemon is running"
SOLARIS_AUDITD_RUNNING=1
Display --indent 2 --text "- Checking Solaris audit daemon status" --result RUNNING --color GREEN
@ -242,8 +243,8 @@
logtext "Result: auditd service is online"
Display --indent 4 --text "- Checking Solaris audit daemon status" --result ONLINE --color GREEN
else
Display --indent 4 --text "- Checking Solaris audit daemon status" --result WARNING --color YELLOW
# YYY
Display --indent 4 --text "- Checking Solaris audit daemon status" --result "NOT ONLINE" --color YELLOW
ReportSuggestion "${TEST_NO}" "Check status of audit daemon"
fi
fi
#
@ -375,7 +376,6 @@
#if [ ${SOLARIS_AUDITD_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
#Register --test-no ACCT-9662 --os Solaris --preqs-met ${PREQS_MET} --weight L --network NO --description "Check BSM auditing in module list"
#if [ ${SKIPTEST} -eq 0 ]; then
#
# Solaris 10 packages
# bash-3.00# pkginfo | egrep 'SUNWcar|SUNWcsr|SUNWcsu|SUNWhea|SUNWman'