Use -n instead of ! -z

1 files changed, 11 insertions, 11 deletions

diff --git a/include/tests_nameservices b/include/tests_nameservices
index 2ae503e3..4b4b1ac8 100644
--- a/include/tests_nameservices
+++ b/include/tests_nameservices
@@ -188,7 +188,7 @@
 
         # If files and commands can't be found, use defined value from resolv.conf
         if [ -z "${DOMAINNAME}" ]; then
-            if [ ! -z "${RESOLV_DOMAINNAME}" ]; then
+            if [ -n "${RESOLV_DOMAINNAME}" ]; then
                 LogText "Result: using domain name from ${ROOTDIR}etc/resolv.conf"
                 DOMAINNAME=${RESOLV_DOMAINNAME}
             else
@@ -197,7 +197,7 @@
             fi
         fi
 
-        if [ ! -z "${DOMAINNAME}" ]; then
+        if [ -n "${DOMAINNAME}" ]; then
             LogText "Result: found domain name"
             Report "domainname=${DOMAINNAME}"
             Display --indent 2 --text "- Searching DNS domain name" --result "${STATUS_FOUND}" --color GREEN
@@ -303,7 +303,7 @@
                 LogText "Result: found configuration file (${BIND_CONFIG_LOCATION})"
             fi
         done
-        if [ ! -z "${BIND_CONFIG_LOCATION}" ]; then
+        if [ -n "${BIND_CONFIG_LOCATION}" ]; then
             Display --indent 4 --text "- Checking BIND configuration file" --result "${STATUS_FOUND}" --color GREEN
         else
             Display --indent 4 --text "- Checking BIND configuration file" --result "${STATUS_NOT_FOUND}" --color YELLOW
@@ -449,12 +449,12 @@
 #
     # Test        : NAME-4238
     # 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
+    if [ ${POWERDNS_RUNNING} -eq 1 -a -n "${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 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
+        if [ -n "${FIND}" ]; then
             LogText "Found master=yes in configuration file"
             Display --indent 4 --text "- PowerDNS authoritative master: YES"
             POWERDNS_AUTH_MASTER=1
@@ -464,7 +464,7 @@
         fi
         LogText "Test: Checking for PowerDNS slave status"
         FIND=$(${GREPBINARY} "^slave=yes" ${POWERDNS_AUTH_CONFIG_LOCATION})
-        if [ ! -z "${FIND}" ]; then
+        if [ -n "${FIND}" ]; then
             LogText "Found slave=yes in configuration file"
             Display --indent 4 --text "- PowerDNS authoritative slave: YES"
             POWERDNS_AUTH_SLAVE=1
@@ -509,7 +509,7 @@
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Checking $(domainname) for NIS domain value"
         FIND=$(${DOMAINNAMEBINARY} | ${GREPBINARY} -v "(none)")
-        if [ ! -z "${FIND}" ]; then
+        if [ -n "${FIND}" ]; then
             LogText "Value: ${FIND}"
             NISDOMAIN="${FIND}"
         else
@@ -520,7 +520,7 @@
         if [ -f ${ROOTDIR}etc/defaultdomain ]; then
             LogText "Result: file ${ROOTDIR}etc/defaultdomain exists"
             FIND2=$(cat ${ROOTDIR}etc/defaultdomain)
-            if [ ! -z "${FIND2}" ]; then
+            if [ -n "${FIND2}" ]; then
                 LogText "Output: ${FIND2}"
                 NISDOMAIN="${FIND2}"
             else
@@ -533,7 +533,7 @@
             LogText "Result: file ${ROOTDIR}etc/sysconfig/network exists"
             LogText "Test: checking NISDOMAIN value in file"
             FIND3=$(${GREPBINARY} "^NISDOMAIN" ${ROOTDIR}etc/sysconfig/network | ${AWKBINARY} -F= '{ print $2 }' | ${SEDBINARY} 's/"//g')
-            if [ ! -z "${FIND3}" ]; then
+            if [ -n "${FIND3}" ]; then
                 LogText "Found NIS domain: ${FIND3}"
                 NISDOMAIN="${FIND3}"
             else
@@ -553,7 +553,7 @@
             fi
         fi
         # Check if we found any NIS domain
-        if [ ! -z "${NISDOMAIN}" ]; then
+        if [ -n "${NISDOMAIN}" ]; then
             LogText "Found NIS domain: ${NISDOMAIN}"
             Report "nisdomain=${NISDOMAIN}"
             Display --indent 4 --text "- Checking NIS domain" --result "${STATUS_FOUND}" --color GREEN
@@ -636,7 +636,7 @@
 #
     # Test        : NAME-4408
     # Description : Check localhost entry
-    if [ ! -z "${GETENT_BINARY}" ]; then PREQS_MET="YES"; SKIPREASON="No getent binary"; else PREQS_MET="NO"; SKIPREASON=""; fi
+    if [ -n "${GETENT_BINARY}" ]; then PREQS_MET="YES"; SKIPREASON="No getent binary"; else PREQS_MET="NO"; SKIPREASON=""; fi
     Register --test-no NAME-4408 --preqs-met ${PREQS_MET} --skip-reason "${SKIPREASON}" --weight L --network NO --category security --description "Check localhost entry"
     if [ ${SKIPTEST} -eq 0 ]; then
         LogText "Test: Check server hostname not locally mapped in /etc/hosts"