diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2018-12-29 19:10:06 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2018-12-29 19:10:06 +0300 |
| commit | 21956cc42cc4968b4d6f367566d05344ff31211f (patch) | |
| tree | 6c494a11bc348cb9b1c259dc29a0603e6e652786 /include/tests_logging | |
| parent | c7eb855ff0d8b0172b318cb2fc302def22f5cf9c (diff) | |
[LOGG-2190] added filter for MariaDB, tested onCentOS
Diffstat (limited to 'include/tests_logging')
| -rw-r--r-- | include/tests_logging | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/tests_logging b/include/tests_logging index b7f86d8d..6377c39d 100644 --- a/include/tests_logging +++ b/include/tests_logging @@ -479,7 +479,7 @@ # # Test : LOGG-2190 # Description : Checking deleted files - if [ ! "${LSOFBINARY}" = "" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi + if [ ! -z "${LSOFBINARY}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no LOGG-2190 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Checking for deleted files in use" if [ ${SKIPTEST} -eq 0 ]; then EARLY_MYSQL="" @@ -488,7 +488,11 @@ LSOF_GREP="WARNING|Output information" # MySQL versions prior to 5.6 leave lots of deleted in-use files in /tmp, ignoring those - if [ ! -z "${DPKGBINARY}" ]; then EARLY_MYSQL=$(${DPKGBINARY} -l | ${EGREPBINARY} mysql-server-5.[0-5]); fi + if [ ! -z "${DPKGBINARY}" ]; then + EARLY_MYSQL=$(${DPKGBINARY} -l | ${EGREPBINARY} mysql-server-5.[0-5]) + elif [ ! -z "${RPMBINARY}" ]; then + EARLY_MYSQL=$(${RPMBINARY} -qa mariadb | ${EGREPBINARY} mariadb-5.[0-5]) + fi if [ ! -z "${EARLY_MYSQL}" ]; then LSOF_GREP="${LSOF_GREP}|mysqld"; fi # grsecurity causes Fail2Ban to hold onto deleted in-use files in /var/tmp |