diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2017-08-17 21:28:32 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2017-08-17 21:28:32 +0300 |
| commit | 00648a636c35aa93099c95b29e72a92fd2c3dea2 (patch) | |
| tree | 272d16fdbcf175285cdf250f1cc7a7aac282a2ad | |
| parent | c0a6aaf855f5994605d46d8d2b5def5d194bec2b (diff) | |
Improve systemd detection
| -rw-r--r-- | include/binaries | 6 | ||||
| -rwxr-xr-x | lynis | 15 |
2 files changed, 15 insertions, 6 deletions
diff --git a/include/binaries b/include/binaries index 2218ec67..5f14fdb2 100644 --- a/include/binaries +++ b/include/binaries @@ -238,8 +238,8 @@ sha256|sha256sum) SHA256SUMFOUND=1; SHA256SUMBINARY="${BINARY}"; LogText " Found known binary: sha256/sha256sum (crypto hashing) - ${BINARY}" ;; ssh-keyscan) SSHKEYSCANFOUND=1; SSHKEYSCANBINARY="${BINARY}"; LogText " Found known binary: ssh-keyscan (scanner for SSH keys) - ${BINARY}" ;; sysctl) SYSCTLFOUND=1; SYSCTLBINARY="${BINARY}"; LogText " Found known binary: sysctl (kernel parameters) - ${BINARY}" ;; - syslog-ng) SYSLOGNGFOUND=1; SYSLOGNGBINARY="${BINARY}"; SYSLOGNGVERSION=$(${BINARY} -V 2>&1 | grep "^syslog-ng" | awk '{ print $2 }'); LogText "Found ${BINARY} (version ${SYSLOGNGVERSION})" ;; - systemctl) SYSTEMCTLFOUND=1; SYSTEMCTLBINARY="${BINARY}"; SERVICE_MANAGER="systemd"; LogText " Found known binary: systemctl (client to systemd) - ${BINARY}" ;; + syslog-ng) SYSLOGNGFOUND=1; SYSLOGNGBINARY="${BINARY}"; SYSLOGNGVERSION=$(${BINARY} -V 2>&1 | grep "^syslog-ng" | awk '{ print $2 }'); LogText "Found ${BINARY} (version ${SYSLOGNGVERSION})" ;; + systemctl) SYSTEMCTLFOUND=1; SYSTEMCTLBINARY="${BINARY}"; SERVICE_MANAGER="systemd"; HAS_SYSTEMD=1; LogText " Found known binary: systemctl (client to systemd) - ${BINARY}" ;; timedatectl) TIMEDATECTLFOUND=1; TIMEDATECTL="${BINARY}"; LogText " Found known binary: timedatectl (timedate client) - ${BINARY}" ;; tr) TRFOUND=1; TRBINARY="${BINARY}"; LogText " Found known binary: tr (text transformation) - ${BINARY}" ;; tripwire) TRIPWIREFOUND=1; TRIPWIREBINARY="${BINARY}"; LogText " Found known binary: tripwire (file integrity) - ${BINARY}" ;; @@ -255,7 +255,7 @@ wc) WCBINARY="${BINARY}" LogText " Found known binary: wc (word count) - ${BINARY}" ;; - wget) WGETFOUND=1; WGETBINARY="${BINARY}"; WGETVERSION=$(${BINARY} -V | grep "^GNU Wget" | awk '{ print $3 }'); LogText "Found ${BINARY} (version ${WGETVERSION})" ;; + wget) WGETFOUND=1; WGETBINARY="${BINARY}"; WGETVERSION=$(${BINARY} -V | grep "^GNU Wget" | awk '{ print $3 }'); LogText "Found ${BINARY} (version ${WGETVERSION})" ;; yum) YUMFOUND=1; YUMBINARY="${BINARY}"; LogText " Found known binary: yum (package manager) - ${BINARY}" ;; xargs) XARGSBINARY="${BINARY}" LogText " Found known binary: xargs (command output redirection) - ${BINARY}" @@ -783,13 +783,22 @@ ${NORMAL} # ################################################################################# # - # Check for systemd presence - if [ -d ${ROOTDIR}lib/systemd/system -a -f ${ROOTDIR}usr/lib/systemd/systemd ]; then + # Check for systemd presence (already tested via binaries: systemctl) + if [ ${HAS_SYSTEMD} -eq 0 ]; then + FOUND=0 + # Backup option to do additional testing for systemd + LIST="${ROOTDIR}lib/systemd/system"; for ITEM in ${LIST}; do if [ -d ${ITEM} ]; then FOUND=1; break; fi; done + LIST="${ROOTDIR}usr/lib/systemd/systemd" + if [ ${FOUND} -eq 0 ]; then for ITEM in ${LIST}; do if [ -f ${ITEM} ]; then FOUND=1; break; fi; done; fi + else + FOUND=1 + fi + if [ ${FOUND} -eq 1 ]; then LogText "Result: systemd is using systemd" HAS_SYSTEMD=1 Report "systemd=1" else - LogText "Result: systemd not found, or partially" + LogText "Result: systemd not found" Report "systemd=0" fi # |