Use detected binaries

1 files changed, 9 insertions, 9 deletions

diff --git a/include/tests_accounting b/include/tests_accounting
index 0b324131..0e522800 100644
--- a/include/tests_accounting
+++ b/include/tests_accounting
@@ -104,7 +104,7 @@
         LogText "Test: check /etc/default/sysstat presence"
         if [ -f ${ROOTDIR}etc/default/sysstat ]; then
             LogText "Result: ${ROOTDIR}etc/default/sysstat found"
-            FIND=`grep "^ENABLED" ${ROOTDIR}etc/default/sysstat | grep -i true`
+            FIND=`${GREPBINARY} "^ENABLED" ${ROOTDIR}etc/default/sysstat | ${GREPBINARY} -i true`
             if [ ! "${FIND}" = "" ]; then
                 LogText "Result: sysstat enabled via ${ROOTDIR}etc/default/sysstat"
                 Display --indent 2 --text "- Checking sysstat accounting data" --result "${STATUS_ENABLED}" --color GREEN
@@ -114,7 +114,7 @@
                 ReportSuggestion ${TEST_NO} "Enable sysstat to collect accounting (disabled)"
             fi
         elif [ -f ${ROOTDIR}etc/cron.d/sysstat ]; then
-            FIND=`grep -v '^[[:space:]]*\(#\|$\)' ${ROOTDIR}etc/cron.d/sysstat`
+            FIND=`${GREPBINARY} -v '^[[:space:]]*\(#\|$\)' ${ROOTDIR}etc/cron.d/sysstat`
             if [ ! "${FIND}" = "" ]; then
                 LogText "Result: sysstat enabled via ${ROOTDIR}etc/cron.d/sysstat"
                 Display --indent 2 --text "- Checking sysstat accounting data" --result "${STATUS_ENABLED}" --color GREEN
@@ -167,7 +167,7 @@
     Register --test-no ACCT-9630 --os Linux --preqs-met ${PREQS_MET} --weight L --network NO --root-only YES --category security --description "Check for auditd rules"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking auditd rules"
-        FIND=`${AUDITCTLBINARY} -l | grep -v "No rules"`
+        FIND=`${AUDITCTLBINARY} -l | ${GREPBINARY} -v "No rules"`
         if [ "${FIND}" = "" ]; then
             LogText "Result: auditd rules empty"
             Display --indent 4 --text "- Checking audit rules" --result "${STATUS_SUGGESTION}" --color YELLOW
@@ -219,7 +219,7 @@
     Register --test-no ACCT-9634 --os Linux --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check for auditd log file"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking auditd log file"
-        FIND=`grep "^log_file" ${AUDITD_CONF_FILE} | ${AWKBINARY} '{ if ($1=="log_file" && $2=="=") { print $3 } }'`
+        FIND=`${GREPBINARY} "^log_file" ${AUDITD_CONF_FILE} | ${AWKBINARY} '{ if ($1=="log_file" && $2=="=") { print $3 } }'`
         if [ ! "${FIND}" = "" ]; then
             LogText "Result: log file is defined"
             LogText "Defined value: ${FIND}"
@@ -251,7 +251,7 @@
             Display --indent 2 --text "- Checking Snoopy" --result "${STATUS_FOUND}" --color GREEN
             if [ -f ${ROOTDIR}etc/ld.so.preload ]; then
                 LogText "Result: found ${ROOTDIR}etc/ld.so.preload, testing if snoopy.so is listed"
-                FIND=`grep ${FILE} ${ROOTDIR}etc/ld.so.preload`
+                FIND=`${GREPBINARY} ${FILE} ${ROOTDIR}etc/ld.so.preload`
                 if [ ! "${FIND}" = "" ]; then
                     LogText "Result: found snoopy in ld.so.preload"
                     LogText "Output: ${FIND}"
@@ -297,7 +297,7 @@
     Register --test-no ACCT-9652 --os Solaris --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check auditd SMF status"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: check if auditd service is enabled and online"
-        FIND=`/usr/bin/svcs svc:/system/auditd:default | grep "^online"`
+        FIND=`/usr/bin/svcs svc:/system/auditd:default | ${GREPBINARY} "^online"`
         if [ ! "${FIND}" = "" ]; then
             LogText "Result: auditd service is online"
             Display --indent 4 --text "- Checking Solaris audit daemon status" --result "${STATUS_ON}"LINE --color GREEN
@@ -316,7 +316,7 @@
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: check if BSM is enabled in ${ROOTDIR}etc/system"
         if [ -f ${ROOTDIR}etc/system ]; then
-            FIND=`grep 'set c2audit:audit_load = 1' ${ROOTDIR}etc/system`
+            FIND=`${GREPBINARY} 'set c2audit:audit_load = 1' ${ROOTDIR}etc/system`
             if [ ! "${FIND}" = "" ]; then
                 LogText "Result: BSM is enabled in ${ROOTDIR}etc/system"
                 Display --indent 4 --text "- Checking Solaris BSM (${ROOTDIR}etc/system)" --result "${STATUS_ENABLED}" --color GREEN
@@ -337,7 +337,7 @@
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: check if c2audit module is active"
         if [ -x /usr/sbin/modinfo ]; then
-            FIND=`/usr/sbin/modinfo | grep c2audit`
+            FIND=`/usr/sbin/modinfo | ${GREPBINARY} c2audit`
             if [ ! "${FIND}" = "" ]; then
                 LogText "Result: c2audit found in modinfo output"
                 Display --indent 4 --text "- Checking Solaris BSM (modules list)" --result "${STATUS_ENABLED}" --color GREEN
@@ -360,7 +360,7 @@
         LogText "Test: check /etc/security/audit_control for event logging location"
         if [ -f ${ROOTDIR}etc/security/audit_control ]; then
             LogText "Result: file ${ROOTDIR}etc/security/audit_control found"
-            FIND=`grep "^dir" ${ROOTDIR}etc/security/audit_control | ${AWKBINARY} -F: '{ print $2 }'`
+            FIND=`${GREPBINARY} "^dir" ${ROOTDIR}etc/security/audit_control | ${AWKBINARY} -F: '{ print $2 }'`
             if [ ! "${FIND}" = "" ]; then
                 LogText "Result: found location ${FIND}"
                 LogText "Test: Checking if location is a valid directory"