Moved section to discover current timestamp related to issue #1329

2 files changed, 31 insertions, 22 deletions

diff --git a/include/osdetection b/include/osdetection
index d9b8a41c..989b1b38 100644
--- a/include/osdetection
+++ b/include/osdetection
@@ -777,10 +777,26 @@
     ECHONB=""
 
     case ${OS} in
-        "AIX")                           ECHOCMD="echo"; ECHONB="printf" ;;
-        "DragonFly"|"FreeBSD"|"NetBSD")  ECHOCMD="echo -e"; ECHONB="echo -n" ;;
-        "macOS" | "Mac OS X")                         ECHOCMD="echo"; ECHONB="/bin/echo -n" ;;
-        "Solaris")                       ECHOCMD="echo" ; test -f /usr/ucb/echo && ECHONB="/usr/ucb/echo -n" ;;
+        "AIX")
+            ECHOCMD="echo";
+            ECHONB="printf"
+        ;;
+        "DragonFly"|"FreeBSD"|"NetBSD")
+            ECHOCMD="echo -e"
+            ECHONB="echo -n"
+            NOW=$(date "+%s")
+        ;;
+        "macOS" | "Mac OS X")
+            ECHOCMD="echo"
+            ECHONB="/bin/echo -n"
+            NOW=$(date "+%s")
+        ;;
+
+        "Solaris")         
+            ECHOCMD="echo"
+            test -f /usr/ucb/echo && ECHONB="/usr/ucb/echo -n"
+            NOW=$(nawk 'BEGIN{print srand()}')
+        ;;
         "Linux")
             # Check if dash is used (Debian/Ubuntu)
             DEFAULT_SHELL=$(ls -l /bin/sh | awk -F'>' '{print $2}')
@@ -788,10 +804,14 @@
                 " dash")                 ECHOCMD="/bin/echo -e" ;;
                 *)                       ECHOCMD="echo -e" ;;
             esac
+            NOW=$(date "+%s")
+        ;;
+        *)
+            ECHOCMD="echo -e"
+            NOW=$(date "+%s")
         ;;
-        *)                               ECHOCMD="echo -e" ;;
     esac
-
+    
     # Check if we have full featured commands, or are using BusyBox as a shell
     if [ -x /bin/busybox ]; then
         if [ -L /bin/ps ]; then
@@ -820,13 +840,10 @@
             if [ -n "${EOL_TIMESTAMP}" ]; then
                 EOL_DATE=$(awk -v value="${FIND}" -F: '{if ($1=="os" && value ~ $2){print $3}}' ${DBDIR}/software-eol.db | head -n 1)
                 if [ -n "${EOL_DATE}" ]; then
-                    NOW=$(date "+%s")
-                    if [ -n "${NOW}" ]; then
-                        if [ ${NOW} -gt ${EOL_TIMESTAMP} ]; then
-                            EOL=1
-                        else
-                            EOL=0
-                        fi
+                    if [ ${NOW} -gt ${EOL_TIMESTAMP} ]; then
+                        EOL=1
+                    else
+                        EOL=0
                     fi
                 else
                     EOL=0
diff --git a/lynis b/lynis
index cf7d6bc6..ab8c479e 100755
--- a/lynis
+++ b/lynis
@@ -514,7 +514,7 @@ ${NORMAL}
     . ${INCLUDEDIR}/osdetection
     Display --indent 2 --text "- Detecting OS... " --result "${STATUS_DONE}" --color GREEN
 
-    # Check hostname
+    # Check hostname and get timestamp
     case ${OS} in
         HP-UX)
                     HOSTNAME=$(hostname) ;;
@@ -531,7 +531,6 @@ ${NORMAL}
     if [ "${OS}" = "Linux" -a "${HOSTNAME}" = "${FQDN}" ]; then
         FQDN=$(hostname -f 2> /dev/null)
     fi
-
 #
 #################################################################################
 #
@@ -789,13 +788,6 @@ ${NORMAL}
         fi
     fi
 
-    # Test for older releases, without testing via update mechanism
-    if [ "${OS}" = "Solaris" ]; then
-        NOW=$(nawk 'BEGIN{print srand()}')
-    else
-        NOW=$(date "+%s")
-    fi
-
     OLD_RELEASE=0
     TIME_DIFFERENCE_CHECK=10368000 # 4 months
     RELEASE_PLUS_TIMEDIFF=$((PROGRAM_RELEASE_TIMESTAMP + TIME_DIFFERENCE_CHECK))