diff options
author | hlein <hlein@korelogic.com> | 2017-03-06 10:41:21 +0300 |
---|---|---|
committer | Michael Boelen <michael.boelen@cisofy.com> | 2017-03-06 10:41:21 +0300 |
commit | b595cc0fb5f0dafe3604f2d2d4915de1acd9c754 (patch) | |
tree | 285792c98f8d9d404d55a0d258c8e274868c74d7 /include/tests_nameservices | |
parent | b9ae378edb9ab109eeb25cc27599b76b2f6f6bfb (diff) |
Various cleanups (#363)
* Typo fix.
* Style change: always use $(), never ``.
The Lynis code already mostly used $(), but backticks were sprinkled
around. Converted all of them.
* Lots of minor spelling/typo fixes.
FWIW these were found with:
find . -type f -print0 | xargs -0 cat | aspell list | sort -u | egrep '^[a-z]+$' | less
And then reviewing the list to pick out things that looked like
misspelled words as opposed to variables, etc., and then manual
inspection of context to determine the intention.
Diffstat (limited to 'include/tests_nameservices')
-rw-r--r-- | include/tests_nameservices | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/include/tests_nameservices b/include/tests_nameservices index eaa2ca10..a1f3168d 100644 --- a/include/tests_nameservices +++ b/include/tests_nameservices @@ -155,7 +155,7 @@ LogText "Test: checking /etc/nodename" if [ -f /etc/nodename ]; then LogText "Result: file /etc/nodename exists" - FIND=`cat /etc/nodename` + FIND=$(cat /etc/nodename) LogText "Output: ${FIND}" Display --indent 2 --text "- Checking /etc/nodename" --result "${STATUS_DONE}" --color GREEN else @@ -176,7 +176,7 @@ #LogText "Test: Checking file /etc/domainname" #if [ -f /etc/domainname ]; then # LogText "Result: file /etc/domainname exists" - # FIND2=`cat /etc/domainname` + # FIND2=$(cat /etc/domainname) # if [ ! "${FIND}" = "" ]; then # LogText "Found domain name: ${FIND}" # DOMAINNAME="${FIND}" @@ -267,11 +267,11 @@ if [ ${UNBOUND_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no NAME-4036 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check Unbound configuration file" if [ ${SKIPTEST} -eq 0 ]; then - FIND=`which unbound-checkconf` + FIND=$(which unbound-checkconf) if [ ! "${FIND}" = "" ]; then LogText "Test: running unbound-checkconf" # Don't capture any output, just gather exit code (0 is fine, otherwise bad) - FIND=`unbound-checkconf > /dev/null 2>&1` + FIND=$(unbound-checkconf > /dev/null 2>&1) if [ $? -eq 0 ]; then UNBOUND_CONFIG_OK=1 LogText "Result: Configuration is fine" @@ -335,7 +335,7 @@ LogText "Test: searching for named-checkconf binary" if [ ! "${NAMEDCHECKCONFBINARY}" = "" ]; then LogText "Result: named-checkconf is installed" - FIND=`${NAMEDCHECKCONFBINARY} ${BIND_CONFIG_LOCATION}; echo $?` + FIND=$(${NAMEDCHECKCONFBINARY} ${BIND_CONFIG_LOCATION}; echo $?) if [ "${FIND}" = "0" ]; then LogText "Result: configuration file ${BIND_CONFIG_LOCATION} seems to be fine" Display --indent 4 --text "- Checking BIND configuration consistency" --result "${STATUS_OK}" --color GREEN @@ -364,7 +364,7 @@ Register --test-no NAME-4210 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check DNS banner" if [ ${SKIPTEST} -eq 0 ]; then LogText "Test: Trying to determine version from banner" - FIND=`${DIGBINARY} @localhost version.bind chaos txt | ${GREPBINARY} "^version.bind" | ${GREPBINARY} TXT | ${EGREPBINARY} "[0-9].[0-9].[0-9]*"` + FIND=$(${DIGBINARY} @localhost version.bind chaos txt | ${GREPBINARY} "^version.bind" | ${GREPBINARY} TXT | ${EGREPBINARY} "[0-9].[0-9].[0-9]*") if [ "${FIND}" = "" ]; then LogText "Result: no useful information in banner found" Display --indent 4 --text "- Checking BIND version in banner" --result "${STATUS_OK}" --color GREEN @@ -470,29 +470,29 @@ ################################################################################# # # Test : NAME-4238 - # Description : Check PowerDNS authoritive status + # Description : Check PowerDNS authoritative status if [ ${POWERDNS_RUNNING} -eq 1 -a ! -z "${POWERDNS_AUTH_CONFIG_LOCATION}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi - Register --test-no NAME-4238 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check PowerDNS authoritive status" + Register --test-no NAME-4238 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check PowerDNS authoritative status" if [ ${SKIPTEST} -eq 0 ]; then LogText "Test: Checking for PowerDNS master status" FIND=$(${GREPBINARY} "^master=yes" ${POWERDNS_AUTH_CONFIG_LOCATION}) if [ ! -z "${FIND}" ]; then LogText "Found master=yes in configuration file" - Display --indent 4 --text "- PowerDNS authoritive master: YES" + Display --indent 4 --text "- PowerDNS authoritative master: YES" POWERDNS_AUTH_MASTER=1 else LogText "Result: most likely not master (no master=yes)" - Display --indent 4 --text "- PowerDNS authoritive master: NO" + Display --indent 4 --text "- PowerDNS authoritative master: NO" fi LogText "Test: Checking for PowerDNS slave status" FIND=$(${GREPBINARY} "^slave=yes" ${POWERDNS_AUTH_CONFIG_LOCATION}) if [ ! -z "${FIND}" ]; then LogText "Found slave=yes in configuration file" - Display --indent 4 --text "- PowerDNS authoritive slave: YES" + Display --indent 4 --text "- PowerDNS authoritative slave: YES" POWERDNS_AUTH_SLAVE=1 else LogText "Result: most likely not slave (no slave=yes)" - Display --indent 4 --text "- PowerDNS authoritive slave: NO" + Display --indent 4 --text "- PowerDNS authoritative slave: NO" fi fi # @@ -529,7 +529,7 @@ if [ ${YPBIND_RUNNING} -eq 1 ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no NAME-4306 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check NIS domain" if [ ${SKIPTEST} -eq 0 ]; then - LogText "Test: Checking `domainname` for NIS domain value" + LogText "Test: Checking $(domainname) for NIS domain value" FIND=$(${DOMAINNAMEBINARY} | ${GREPBINARY} -v "(none)") if [ ! -z "${FIND}" ]; then LogText "Value: ${FIND}" @@ -541,7 +541,7 @@ LogText "Test: Checking file ${ROOTDIR}etc/defaultdomain" if [ -f ${ROOTDIR}etc/defaultdomain ]; then LogText "Result: file ${ROOTDIR}etc/defaultdomain exists" - FIND2=`cat ${ROOTDIR}etc/defaultdomain` + FIND2=$(cat ${ROOTDIR}etc/defaultdomain) if [ ! -z "${FIND2}" ]; then LogText "Output: ${FIND2}" NISDOMAIN="${FIND2}" @@ -641,7 +641,7 @@ Register --test-no NAME-4406 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check server hostname mapping" if [ ${SKIPTEST} -eq 0 ]; then LogText "Test: Check server hostname not locally mapped in /etc/hosts" - sFIND=`${EGREPBINARY} -v '^(#|$)' /etc/hosts | ${EGREPBINARY} '^(localhost|::1)\s' | ${GREPBINARY} -w ${HOSTNAME}` + sFIND=$(${EGREPBINARY} -v '^(#|$)' /etc/hosts | ${EGREPBINARY} '^(localhost|::1)\s' | ${GREPBINARY} -w ${HOSTNAME}) if [ ! "${sFIND}" = "" ]; then LogText "Result: Found this server hostname mapped to a local address" LogText "Output: ${sFIND}" |