diff --git a/include/binaries b/include/binaries index 6c4a8059..f68c1e85 100644 --- a/include/binaries +++ b/include/binaries @@ -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}" diff --git a/include/functions b/include/functions index 21736f71..caaa71ec 100644 --- a/include/functions +++ b/include/functions @@ -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}" diff --git a/lynis b/lynis index 5734ef21..bebbb68a 100755 --- a/lynis +++ b/lynis @@ -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 # #################################################################################