Prepare for 1.6.2 and make permissions test less strict (due to pentest option and packaging)

1 files changed, 8 insertions, 8 deletions

diff --git a/lynis b/lynis
index 10f8c248..378b7af5 100755
--- a/lynis
+++ b/lynis
@@ -20,8 +20,8 @@
 #
     # Program information
     PROGRAM_name="Lynis"
-    PROGRAM_version="1.6.1"
-    PROGRAM_releasedate="9 September 2014"
+    PROGRAM_version="1.6.2"
+    PROGRAM_releasedate="11 September 2014"
     PROGRAM_author="Michael Boelen"
     PROGRAM_author_contact="michael.boelen@cisofy.com"
     PROGRAM_website="http://cisofy.com"
@@ -32,7 +32,7 @@
 
     PROGRAM_extrainfo="Enterprise support and plugins available via CISOfy - http://cisofy.com"
     # Release version (beta or final)
-    PROGRAM_releasetype="final"
+    PROGRAM_releasetype="draft"
     # Version number of report files (when format changes in future)
     REPORT_version_major="1"; REPORT_version_minor="0"
     REPORT_version="${REPORT_version_major}.${REPORT_version_minor}"
@@ -89,13 +89,13 @@
     OWNER2ID=`ls -n ${INCLUDEDIR}/functions | awk -F" " '{ print $3 }'`
 
     ISSUE=0
-    # Check permissions of include/consts file
-    if [ ! "${PERMS}" = "r--------" -a ! "${PERMS}" = "rw-------" ]; then
-        ISSUE=1; echo "[!] Change file permissions of ${INCLUDEDIR}/consts to 600."; echo "    Command: chmod 600 ${INCLUDEDIR}/consts"
+    # Check permissions of include/consts file (400, 600, 640, 644)
+    if [ ! "${PERMS}" = "r--------" -a ! "${PERMS}" = "rw-------" -a ! "${PERMS}" = "rw-r-----" -a ! "${PERMS}" = "rw-r--r--" ]; then
+        ISSUE=1; echo "[!] Change file permissions of ${INCLUDEDIR}/consts to 640."; echo "    Command: chmod 640 ${INCLUDEDIR}/consts"
     fi
     # Check permissions of include/functions file
-    if [ ! "${PERMS2}" = "r--------" -a ! "${PERMS2}" = "rw-------" ]; then
-        ISSUE=1; echo "[!] Change file permissions of ${INCLUDEDIR}/functions to 600."; echo "    Command: chmod 600 ${INCLUDEDIR}/functions"
+    if [ ! "${PERMS2}" = "r--------" -a ! "${PERMS2}" = "rw-------" -a ! "${PERMS}" = "rw-r-----" -a ! "${PERMS}" = "rw-r--r--" ]; then
+        ISSUE=1; echo "[!] Change file permissions of ${INCLUDEDIR}/functions to 640."; echo "    Command: chmod 640 ${INCLUDEDIR}/functions"
     fi
     # Check if owner of both files is root user, or the same user which is running Lynis (for pentester mode)
     if [ ! "${OWNER}" = "root" -a ! "${OWNERID}" = "0" -a ! "${MYID}" = "${OWNER2ID}" ]; then