From ee18e76e976eef981a36a702b6ee0504f0cce645 Mon Sep 17 00:00:00 2001
From: Michael Boelen <michael.boelen@cisofy.com>
Date: Wed, 21 Aug 2019 13:41:23 +0200
Subject: Preparations for forensics scan mode

---
 include/parameters | 63 +++++++++++++++++++++++-------------------------------
 1 file changed, 27 insertions(+), 36 deletions(-)

(limited to 'include/parameters')

diff --git a/include/parameters b/include/parameters
index 49c0f495..483f2193 100644
--- a/include/parameters
+++ b/include/parameters
@@ -247,29 +247,9 @@
                 DEVELOPER_MODE=1
             ;;
 
-            # Display all available options with short alias
-            --dump-options | --dumpoptions)
-                OPTIONS="--auditor
-                         --check-all_(-c) --cronjob_(--cron)
-                         --debug
-                         --help_(-h)
-                         --info
-                         --license-key --log-file
-                         --manpage_(--man)
-                         --no-colors --no-log
-                         --pentest --profile --plugins-dir
-                         --quiet_(-q) --quick_(-Q)
-                         --report-file --reverse-colors
-                         --tests
-                         --upload
-                         --version_(-V)"
-                for ITEM in ${OPTIONS}; do
-                    echo "${ITEM}" | tr '_' ' '
-                done
-                echo "This option is deprecated"
-                echo "Use: lynis show options"
-
-                ExitClean
+            # Enable forensics mode (gather information from a mounted directory)
+            --forensics)
+                FORENSICS=1
             ;;
 
             # View help
@@ -277,19 +257,6 @@
                 VIEWHELP=1
             ;;
 
-            # View program/database information
-            --check-update | --check-updates | --info)
-                echo "This option is deprecated"
-                echo "Use: lynis update info"
-                ExitClean
-            ;;
-
-            # License key for Lynis Enterprise
-            --license-key)
-                shift
-                LICENSE_KEY=$1
-            ;;
-
             # Adjust default logfile location
             --logfile | --log-file)
                 shift
@@ -455,6 +422,30 @@
                 exit 1
             ;;
 
+            # Soon to be deprecated options
+
+            # View program/database information
+            --check-update | --check-updates | --info)
+                echo "This option is deprecated"
+                echo "Use: lynis update info"
+                ExitFatal
+            ;;
+
+            # Display all available options with short alias
+            --dump-options | --dumpoptions)
+                echo "This option is deprecated"
+                echo "Use: lynis show options"
+                ExitFatal
+            ;;
+
+            # License key for Lynis Enterprise
+            --license-key)
+                echo "This option is deprecated"
+                echo "Define a license key in /etc/lynis/custom.prf"
+                ExitFatal
+            ;;
+
+
             # Drop out when using wrong option(s)
             *)
                 # Wrong option used, we bail out later
-- 
cgit v1.2.3