Skip to content

Commit 7bf2024

Browse files
committed
Merge branch 'master' of https://github.com/CISOfy/lynis
2 parents 48279f7 + 5f4c789 commit 7bf2024

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
### Changed
2020
- Correction of software EOL database and inclusion of AIX entries
2121
- Support sysctl value perf_event_paranoid -> 2|3
22-
- Update of Turkish translation
23-
- Update of Portuguese translation
22+
- Update of translations: German, Portuguest, Turkish
2423
- Grammar and spell improvements
2524
- Improved package detection on Alpine Linux
2625
- Slackware support to check installed packges (functionPackageIsInstalled())
@@ -32,6 +31,7 @@
3231
- CONT-8104 - Checking for errors, not only warning in docker info output
3332
- DBS-1826 - PostgreSQL detection improved for AlmaLinux, Rocky Linux, and FreeBSD
3433
- FILE-6344 - Test kernel version (major/minor)
34+
- INSE-8000 - Added inetd package and service name used in ubuntu 24.04
3535
- KRNL-5622 - Use systemctl get-default instead of following link
3636
- KRNL-5820 - Accept ulimit with -H parameter also
3737
- LOGG-2144 - Check for wazuh-agent presence on Linux systems
@@ -43,6 +43,7 @@
4343
- PKGS-7303 - Added version numbers to brew packages
4444
- PKGS-7370 - Cron job check for debsums improved
4545
- PKGS-7392 - Improved filtering of apt-check output (Ubuntu 24.04 may give an error)
46+
- PKGS-7410 - Added kernel name for Hardkernel odroid XU4
4647

4748
---------------------------------------------------------------------------------
4849

db/languages/de

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,4 @@ STATUS_WEAK="SCHWACH"
106106
STATUS_YES="JA"
107107
TEXT_UPDATE_AVAILABLE="Aktualisierung verfügbar"
108108
TEXT_YOU_CAN_HELP_LOGFILE="Sie können durch Übermittlung Ihrer Logdatei helfen"
109-
#SECTION_KERBEROS="Kerberos"
109+
SECTION_KERBEROS="Kerberos"

include/tests_filesystems

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -877,8 +877,8 @@
877877
fi
878878
FIND=$(${LSBINARY} ${ROOTDIR}etc/modprobe.d/* 2> /dev/null)
879879
if [ -n "${FIND}" ]; then
880-
FIND1=$(${GREPBINARY} -E "^blacklist \+${FS}$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
881-
FIND2=$(${GREPBINARY} -E "^install \+${FS} \+/bin/true$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
880+
FIND1=$(${GREPBINARY} -E "^blacklist[[:space:]]+${FS}$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
881+
FIND2=$(${GREPBINARY} -E "^install[[:space:]]+${FS}[[:space:]]+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/* | ${GREPBINARY} -v "#")
882882
if [ -n "${FIND1}" ] || [ -n "${FIND2}" ]; then
883883
Display --indent 4 --text "- Module $FS is blacklisted" --result "OK" --color GREEN
884884
LogText "Result: module ${FS} is blacklisted"

include/tests_insecure_services

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
if [ ${SKIPTEST} -eq 0 ]; then
4242
# Check for installed inetd daemon
4343
LogText "Test: Checking if inetd is installed"
44-
if PackageIsInstalled "inetd"; then
44+
if PackageIsInstalled "inetd" || PackageIsInstalled "inetutils-inetd"; then
4545
INETD_PACKAGE_INSTALLED=1
4646
LogText "Result: inetd is installed"
4747
Display --indent 2 --text "- Installed inetd package" --result "${STATUS_FOUND}" --color YELLOW
@@ -61,7 +61,7 @@
6161
if [ ${SKIPTEST} -eq 0 ]; then
6262
# Check running processes
6363
LogText "Test: Searching for active inet daemon"
64-
if IsRunning "inetd"; then
64+
if IsRunning "inetd" || IsRunning "inetutils-inetd"; then
6565
LogText "Result: inetd is running"
6666
Display --indent 4 --text "- inetd status" --result "${STATUS_ACTIVE}" --color GREEN
6767
INETD_ACTIVE=1

include/tests_networking

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@
750750
UNCOMMON_PROTOCOL_DISABLED=0
751751
# First check modprobe.conf
752752
if [ -f ${ROOTDIR}etc/modprobe.conf ]; then
753-
DATA=$(${GREPBINARY} "^install \+${P} \+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.conf)
753+
DATA=$(${GREPBINARY} -E "^install[[:space:]]+${P}[[:space:]]+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.conf)
754754
if [ -n "${DATA}" ]; then
755755
LogText "Result: found ${P} module disabled via modprobe.conf"
756756
UNCOMMON_PROTOCOL_DISABLED=1
@@ -759,7 +759,7 @@
759759
# Then additional modprobe configuration files
760760
if [ -d ${ROOTDIR}etc/modprobe.d ]; then
761761
# Return file names (-l) and suppress errors (-s)
762-
DATA=$(${GREPBINARY} -l -s "^install \+${P} \+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/*)
762+
DATA=$(${GREPBINARY} -l -s -E "^install[[:space:]]+${P}[[:space:]]+/bin/(true|false)$" ${ROOTDIR}etc/modprobe.d/*)
763763
if [ -n "${DATA}" ]; then
764764
UNCOMMON_PROTOCOL_DISABLED=1
765765
for F in ${DATA}; do

include/tests_ports_packages

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,7 @@ EOF
13781378

13791379
if [ "${DPKGBINARY}" ]; then
13801380
TESTED=1
1381-
KERNEL_PKG_NAMES="linux-image-[0-9]|raspberrypi-kernel|pve-kernel-[0-9]"
1381+
KERNEL_PKG_NAMES="linux-image-[0-9]|raspberrypi-kernel|pve-kernel-[0-9]|linux-odroid-5422"
13821382
KERNELS=$(${DPKGBINARY} -l 2> /dev/null | ${GREPBINARY} -E "${KERNEL_PKG_NAMES}" | ${WCBINARY} -l)
13831383
if [ ${KERNELS} -eq 0 ]; then
13841384
LogText "Result: found no kernels from dpkg -l output, which is unexpected"

0 commit comments

Comments
 (0)