Extend hostname information for systems that show errors while running hostname command

1 files changed, 9 insertions, 5 deletions

diff --git a/lynis b/lynis
index e9e5fc10..4475de70 100755
--- a/lynis
+++ b/lynis
@@ -462,15 +462,19 @@ ${NORMAL}
     # Check hostname
     case ${OS} in
         HP-UX)
-                    HOSTNAME=`hostname` ;;
+                    HOSTNAME=$(hostname) ;;
         Solaris)
-                    HOSTNAME=`uname -n` ;;
+                    HOSTNAME=$(uname -n) ;;
         *)
-                    HOSTNAME=`hostname -s 2> /dev/null` ;;
+                    HOSTNAME=$(hostname -s 2> /dev/null) ;;
     esac
-    FQDN=`hostname 2> /dev/null`
+    if [ -z "${HOSTNAME}" ]; then
+        HOSTNAME=$(hostname 2> /dev/null)
+        if [ -z "${HOSTNAME}" ]; then HOSTNAME="no-hostname"; fi
+    fi
+    FQDN=$(hostname 2> /dev/null)
     if [ "${OS}" = "Linux" -a "${HOSTNAME}" = "${FQDN}" ]; then
-        FQDN=`hostname -f 2> /dev/null`
+        FQDN=$(hostname -f 2> /dev/null)
     fi
 #
 #################################################################################