Use -n instead of ! -z

1 files changed, 18 insertions, 18 deletions

diff --git a/include/tests_mail_messaging b/include/tests_mail_messaging
index b74a7c5e..f5770bc2 100644
--- a/include/tests_mail_messaging
+++ b/include/tests_mail_messaging
@@ -77,20 +77,20 @@
         # Smarthost or Satellite
         FIND3=$(echo "${EXIM_ROUTERS}" | ${EGREPBINARY} '^smarthost')
 
-        if [ ! -z "${FIND}" ]; then
+        if [ -n "${FIND}" ]; then
             EXIM_TYPE="LOCAL ONLY"
-        elif [ ! -z "${FIND2}" ]; then
+        elif [ -n "${FIND2}" ]; then
             EXIM_TYPE="INTERNET HOST"
-        elif [ ! -z "${FIND3}" ]; then
+        elif [ -n "${FIND3}" ]; then
             FIND4=$(echo "${EXIM_ROUTERS}" | ${EGREPBINARY} '^hub_user_smarthost')
-            if [ ! -z "${FIND4}" ]; then
+            if [ -n "${FIND4}" ]; then
                 EXIM_TYPE="SATELLITE"
             else
                 EXIM_TYPE="SMARTHOST"
             fi
         fi
 
-        if [ ! -z "${EXIM_TYPE}" ]; then
+        if [ -n "${EXIM_TYPE}" ]; then
             LogText "Result: Exim Type - ${EXIM_TYPE}"
             Display --indent 4 --text "- Type" --result "${EXIM_TYPE}" --color GREEN
         else
@@ -101,7 +101,7 @@
         if [ "${EXIM_TYPE}" = "INTERNET HOST" -o "${EXIM_TYPE}" = "SMARTHOST" ]; then
             LogText "Test: Exim Public Interfaces"
             EXIM_IP=$(exim -bP local_interfaces | cut -d '=' -f2 | sed -e 's/\s*<\s*\;\?//' -e 's/\s*::0\s*\;\?//' -e 's/\s*127.0.0.1\s*\;\?//' -e 's/^\s*//' -e 's/\s*$//')
-            if [ ! -z "${EXIM_IP}" ]; then
+            if [ -n "${EXIM_IP}" ]; then
                 LogText "Result: ${EXIM_IP}"
                 Display --indent 4 --text "- Public Interface(s)" --result "${EXIM_IP}" --color GREEN
             else
@@ -111,7 +111,7 @@
 
             LogText "Test: Exim TLS State"
             EXIM_TLS=$(exim -bP tls_advertise_hosts | cut -d '=' -f2 | sed -e 's/^\s*//' -e 's/\s*$//')
-            if [ ! -z "${EXIM_TLS}" ]; then
+            if [ -n "${EXIM_TLS}" ]; then
                 LogText "Result: Enabled"
                 Display --indent 4 --text "- TLS" --result "ENABLED" --color GREEN
             else
@@ -120,7 +120,7 @@
             fi
         fi
 
-        if [ ! -z "${EXIM_TYPE}" -a "${EXIM_TYPE}" != "LOCAL ONLY" ]; then
+        if [ -n "${EXIM_TYPE}" -a "${EXIM_TYPE}" != "LOCAL ONLY" ]; then
             LogText "Test: Exim Certificate and Private Key"
 
             case "${EXIM_TYPE}" in
@@ -134,7 +134,7 @@
                     ;;
             esac
 
-            if [ ! -z "${EXIM_CERTIFICATE}" ]; then
+            if [ -n "${EXIM_CERTIFICATE}" ]; then
                 LogText "Result: ${EXIM_CERTIFICATE}"
                 if [ -f "${EXIM_CERTIFICATE}" ]; then
                     Display --indent 4 --text "- Certificate" --result "${STATUS_FOUND}" --color GREEN
@@ -148,7 +148,7 @@
                 Display --indent 4 --text "- Certificate not set" --result "${STATUS_WARNING}" --color WHITE
             fi
 
-            if [ ! -z "${EXIM_PRIVATEKEY}" ]; then
+            if [ -n "${EXIM_PRIVATEKEY}" ]; then
                 LogText "Result: ${EXIM_PRIVATEKEY}"
                 if [ -f "${EXIM_PRIVATEKEY}" ]; then
                     LogText "Result: Private Key found."
@@ -175,7 +175,7 @@
         LogText "Test: check Postfix status"
         # Some other processes also use master, therefore it should include both master and postfix
         FIND1=$(${PSBINARY} ax | ${GREPBINARY} "master" | ${GREPBINARY} "postfix" | ${GREPBINARY} -v "grep")
-        if [ ! -z "${FIND1}" ]; then
+        if [ -n "${FIND1}" ]; then
             LogText "Result: found running Postfix process"
             Display --indent 2 --text "- Postfix status" --result "${STATUS_RUNNING}" --color GREEN
             POSTFIX_RUNNING=1
@@ -210,7 +210,7 @@
     if [ ${SKIPTEST} -eq 0  ]; then
         LogText "Test: using postconf to see if Postfix configuration has errors"
         FIND=$(${POSTCONFBINARY} 2>&1 | ${GREPBINARY} "warning:")
-        if [ ! -z "${FIND}" ]; then
+        if [ -n "${FIND}" ]; then
             Report "postfix_config_error=1"
             Display --indent 6 --text "- Postfix configuration errors" --result "${STATUS_WARNING}" --color RED
             LogText "Result: found an error or warning in the Postfix configuration. Manual check suggested."
@@ -233,21 +233,21 @@
         FIND2=$(${POSTCONFBINARY} 2> /dev/null | ${GREPBINARY} '^smtpd_banner' | ${GREPBINARY} '$mail_name')
         FIND3=$(${POSTCONFBINARY} 2> /dev/null | ${GREPBINARY} '^mail_name' | ${GREPBINARY} -i 'postfix')
         FIND4=$(${POSTCONFBINARY} 2> /dev/null | ${GREPBINARY} '^smtpd_banner' | ${GREPBINARY} -i "${OS}")
-        if [ ! -z "${LINUX_VERSION}" ]; then
+        if [ -n "${LINUX_VERSION}" ]; then
             FIND5=$(${POSTCONFBINARY} 2> /dev/null | ${GREPBINARY} '^smtpd_banner' | ${GREPBINARY} -i "${LINUX_VERSION}")
         fi
         SHOWWARNING=0
 
-        if [ ! -z "${FIND1}" ]; then
+        if [ -n "${FIND1}" ]; then
             SHOWWARNING=1
             Report "banner_software_disclosure[]=${FIND1}"
-        elif [ ! -z "${FIND2}" -a ! -z "${FIND3}" ]; then
+        elif [ -n "${FIND2}" -a -n "${FIND3}" ]; then
             SHOWWARNING=1
             Report "banner_software_disclosure[]=${FIND2}"
-        elif [ ! -z "${FIND4}" ]; then
+        elif [ -n "${FIND4}" ]; then
             SHOWWARNING=1
             Report "banner_os_disclosure[]=${FIND4}"
-        elif [ ! -z "${FIND5}" ]; then
+        elif [ -n "${FIND5}" ]; then
             SHOWWARNING=1
             Report "banner_os_disclosure[]=${FIND5}"
         fi
@@ -342,7 +342,7 @@
 #
     # Test        : MAIL-8920
     # Description : Check OpenSMTPD process status
-    if [ ! -z "${SMTPCTLBINARY}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
+    if [ -n "${SMTPCTLBINARY}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi
     Register --test-no MAIL-8920 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check OpenSMTPD status"
     if [ ${SKIPTEST} -eq 0  ]; then
         LogText "Test: check smtpd status"