diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2016-09-10 17:12:44 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2016-09-10 17:12:44 +0300 |
| commit | 903016df362e39444d314a81dd4a0ebc61b67da0 (patch) | |
| tree | e922e2e0039428dec461bfea52ff8e503720370a /include/tests_snmp | |
| parent | 2534fb99a9dbc869fd90f0967c6917191b306b69 (diff) | |
Code cleanups and generic enhancements
Diffstat (limited to 'include/tests_snmp')
| -rw-r--r-- | include/tests_snmp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/tests_snmp b/include/tests_snmp index ae2fa62f..ae2eb18a 100644 --- a/include/tests_snmp +++ b/include/tests_snmp @@ -22,7 +22,7 @@ # ################################################################################# # - SNMP_DAEMON_CONFIG_LOCS="/etc/snmp" + SNMP_DAEMON_CONFIG_LOCS="${ROOTDIR}etc/snmp" SNMP_DAEMON_CONFIG="" SNMP_DAEMON_RUNNING=0 # @@ -41,7 +41,7 @@ SNMP_DAEMON_RUNNING=1 LogText "Result: SNMP daemon is running" Display --indent 2 --text "- Checking running SNMP daemon" --result "${STATUS_FOUND}" --color GREEN - else + else LogText "Result: No running SNMP daemon found" Display --indent 2 --text "- Checking running SNMP daemon" --result "${STATUS_NOT_FOUND}" --color WHITE fi @@ -57,15 +57,15 @@ 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" - SNMPD_DAEMON_CONFIG="${I}/snmpd.conf" + LogText "Result: ${I}/snmpd.conf exists" + SNMP_DAEMON_CONFIG="${I}/snmpd.conf" fi done - if [ "${SNMPD_DAEMON_CONFIG}" = "" ]; then + if [ -z "${SNMP_DAEMON_CONFIG}" ]; then LogText "Result: No snmpd configuration found" Display --indent 4 --text "- Checking SNMP configuration" --result "${STATUS_NOT_FOUND}" --color WHITE - else - LogText "Restult: using last found configuration file: ${SNMPD_DAEMON_CONFIG}" + else + LogText "Restult: using last found configuration file: ${SNMP_DAEMON_CONFIG}" Display --indent 4 --text "- Checking SNMP configuration" --result "${STATUS_FOUND}" --color GREEN fi fi @@ -74,12 +74,12 @@ # # Test : SNMP-3306 # Description : Determine SNMP communities - if [ ! "${SNMPD_DAEMON_CONFIG}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi + if [ ! "${SNMP_DAEMON_CONFIG}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no SNMP-3306 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check SNMP communities" if [ ${SKIPTEST} -eq 0 ]; then WARN=0 LogText "Test: reading active snmp communities" - FIND=`${AWKBINARY} '/^com2sec/ { print $4 }' ${SNMPD_DAEMON_CONFIG}` + FIND=$(${AWKBINARY} '/^com2sec/ { print $4 }' ${SNMP_DAEMON_CONFIG}) for I in ${FIND}; do LogText "Output: ${I}" if [ "${I}" = "public" -o "${I}" = "private" ]; then @@ -93,7 +93,7 @@ if [ ${WARN} -eq 0 ]; then Display --indent 2 --text "- Checking SNMP community strings" --result "${STATUS_OK}" --color GREEN AddHP 2 2 - else + else Display --indent 2 --text "- Checking SNMP community strings" --result "${STATUS_WARNING}" --color RED ReportWarning ${TEST_NO} "Found easy guessable SNMP community string" fi |