tyler.durden
/
lynis
mirror of https://github.com/CISOfy/lynis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Altered symlink function, message display, small cleanups

This commit is contained in:
mboelen 2014-10-13 19:36:36 +02:00
parent 0378677ea9
commit ebdee5b0d2
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/binaries
View File

@ -46,7 +46,7 @@
if [ -L ${SCANDIR} ]; then
logtext "Result: directory exists, but is actually a symlink"
ShowSymlinkPath ${SCANDIR}
if [ ${FOUNDPATH} -eq 1 -a -d ${sFILE} ]; then
if [ ${FOUNDPATH} -eq 1 -a -d ${rFILE} ]; then
# Set path to new location
logtext "Result: found the path behind this symlink (${SCANDIR} --> ${sFILE})"
ORGPATH="${SCANDIR}"

11
include/functions
View File

@ -824,7 +824,7 @@
if [ "${VALUE}" = "on" ]; then NGINX_SSL_PREFER_SERVER_CIPHERS=1; fi
;;
ssl_protocols)
NGINX_SSL_PROTOCOLS=1
NGINX_SSL_PROTOCOLS=1
;;
ssl_session_cache)
;;
@ -850,7 +850,7 @@
# Check for symlink
if [ -L ${sFILE} ]; then
if [ ! "${READLINKBINARY}" = "" ]; then
tFILE=`${READLINKBINARY} ${sFILE}`
tFILE=`${READLINKBINARY} -f ${sFILE}`
# Check if we can find the file now
if [ -f ${tFILE} ]; then
rFILE="${tFILE}"
@ -862,12 +862,12 @@
tFILE="${tDIR}/${tFILE}"
if [ -f ${tFILE} ]; then
rFILE="${tFILE}"
logtext "Result: symlink found, seems to be ${sFILE}"
logtext "Result: symlink found, seems to be ${rFILE}"
fi
fi
fi
else
# No symlinke
# No symlink
rFILE="${sFILE}"
fi
}
@ -1183,7 +1183,7 @@
# Check for symlink
if [ -L ${sFILE} ]; then
if [ ! "${READLINKBINARY}" = "" ]; then
tFILE=`${READLINKBINARY} ${sFILE}`
tFILE=`${READLINKBINARY} -f ${sFILE}`
# Check if we can find the file now
if [ -f ${tFILE} ]; then
sFILE="${tFILE}"
@ -1199,7 +1199,6 @@
tFILE="${tDIR}/${tFILE}"
if [ -L ${tFILE} ]; then
logtext "Result: this symlink links to another symlink"
# Trying it with -f option
tFILE=`${READLINKBINARY} -f ${tFILE}`
if [ -f ${tFILE} ]; then
sFILE="${tFILE}"

2
lynis
View File

@ -268,11 +268,9 @@
echo " requesting support. Due the nature of beta releases, it"
echo " is possible new features give unexpected warnings."
echo ""
echo " Press [ENTER] to continue or [CTRL] + C to break"
echo ""
echo " #########################################################"
echo "${NORMAL}"; echo ""
if [ ${NEVERBREAK} -eq 0 ]; then read void; fi
fi
#
#################################################################################