Show what profile is used when using --config

This commit is contained in:
mboelen 2016-02-02 17:07:20 +01:00
parent 647b482c53
commit ac5c98d76c
4 changed files with 16 additions and 2 deletions

View File

@ -143,6 +143,7 @@ unset LANG
SHELL_IS_BUSYBOX=0
SHOW_PROGRAM_DETAILS=1
SHOW_REPORT=1
SHOW_SETTINGS_FILE=0
SKIPPED_TESTS_ROOTONLY=""
SSHKEYSCANBINARY=""
SSHKEYSCANFOUND=0

View File

@ -97,6 +97,10 @@
CHECK=1
;;
--config)
SHOW_SETTINGS_FILE=1
;;
# Cronjob support
--cronjob | --cron)
CRONJOB=1;
@ -114,7 +118,7 @@
# Display all available options with short alias
--dump-options | --dumpoptions)
OPTIONS="--auditor
--check-all_(-c) --cronjob_(--cron)
--check-all_(-c) --config --cronjob_(--cron)
--debug
--help_(-h)
--info

6
lynis
View File

@ -289,6 +289,12 @@
ExitCustom 66
fi
if [ ${SHOW_SETTINGS_FILE} -eq 1 ]; then
echo "Settings file: ${PROFILE}"
echo ""; echo ""
ExitClean
fi
# Initialize and check profile file, auditor name, log file and report file
if [ ! -r ${PROFILE} ]; then echo "Fatal error: Can't open profile file (${PROFILE})"; exit 1; fi
if [ "${AUDITORNAME}" = "" ]; then AUDITORNAME="[Unknown]"; fi

View File

@ -1,4 +1,4 @@
.TH Lynis 8 "10 September 2015" "1.19" "Unix System Administrator's Manual"
.TH Lynis 8 "2 February 2016" "1.20" "Unix System Administrator's Manual"
.SH "NAME"
@ -58,6 +58,9 @@ each test to stdout. Additional information will be saved into a log file
.IP
In case the outcome of a scan needs to be automated, use the report file.
.TP
.B \-\-config
Show which settings file or profile is being used, then quit.
.TP
.B \-\-cronjob
Perform automatic scan with cron safe options (no colors, no questions, no
breaks).