diff options
| author | mslifcak <slifcan@gmail.com> | 2017-05-23 15:56:25 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2017-05-23 15:56:25 +0300 |
| commit | af60a2463a3ba8fa34ffb7a34da3eab3e0a7a81a (patch) | |
| tree | 4f778b2b86f8c3ba78a75f4ea378f149fa8bcf0a | |
| parent | c3a7c5ed5bce9b80fba44c5ddca26420f39ae824 (diff) | |
250 fixes (#393)
* restore use of lshw
* add ROOTDIR to restore lost PHP file ref
* refactor certificate search to benefit older "find" command
| -rw-r--r-- | include/functions | 2 | ||||
| -rw-r--r-- | include/tests_crypto | 2 | ||||
| -rw-r--r-- | include/tests_php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/functions b/include/functions index 177a297c..82d8fa68 100644 --- a/include/functions +++ b/include/functions @@ -1459,7 +1459,7 @@ fi # lshw - if HasData "${SHORT}"; then + if [ "${SHORT}" = "" ]; then if [ ${PRIVILEGED} -eq 1 ]; then if [ -x /usr/bin/lshw ]; then LogText "Test: trying to guess virtualization with lshw" diff --git a/include/tests_crypto b/include/tests_crypto index cbbda9d7..7ae300f1 100644 --- a/include/tests_crypto +++ b/include/tests_crypto @@ -44,7 +44,7 @@ if [ ${CANREAD} -eq 1 ]; then LogText "Result: found directory ${DIR}" # Search for CRT files - sFINDCRTS=$(${FINDBINARY} ${DIR} -name "*.crt" -or -name "*.pem" -or -name "cert*" -and -type f -print 2> /dev/null) + sFINDCRTS=$(${FINDBINARY} ${DIR} -type f 2> /dev/null | ${EGREPBINARY} ".crt$|.pem$|^cert") if [ ! -z "${sFINDCRTS}" ]; then for FILE in ${sFINDCRTS}; do FileIsReadable ${FILE} diff --git a/include/tests_php b/include/tests_php index e19c6ec4..4a14a0c5 100644 --- a/include/tests_php +++ b/include/tests_php @@ -29,7 +29,7 @@ ${ROOTDIR}etc/php/php.ini ${ROOTDIR}etc/php5.5/php.ini ${ROOTDIR}etc/php5.6/php.ini ${ROOTDIR}etc/php7.0/php.ini ${ROOTDIR}etc/php7.1/php.ini ${ROOTDIR}etc/php7.2/php.ini \ ${ROOTDIR}etc/php/cgi-php5/php.ini ${ROOTDIR}etc/php/cli-php5/php.ini ${ROOTDIR}etc/php/apache2-php5/php.ini \ ${ROOTDIR}etc/php/apache2-php5.5/php.ini ${ROOTDIR}etc/php/apache2-php5.6/php.ini ${ROOTDIR}etc/php/apache2-php7.0/php.ini ${ROOTDIR}etc/php/apache2-php7.1/php.ini \ - ${ROOTDIR}etc/php/cgi-php7.1/php.ini ${ROOTDIR}etc/php/apache2-php7.1/php.inietc/php/cgi-php5.5/php.ini ${ROOTDIR}etc/php/cgi-php5.6/php.ini ${ROOTDIR}etc/php/cgi-php7.0/php.ini \ + ${ROOTDIR}etc/php/cgi-php7.1/php.ini ${ROOTDIR}etc/php/apache2-php7.1/php.ini ${ROOTDIR}etc/php/cgi-php5.5/php.ini ${ROOTDIR}etc/php/cgi-php5.6/php.ini ${ROOTDIR}etc/php/cgi-php7.0/php.ini \ ${ROOTDIR}etc/php/cli-php7.1/php.ini ${ROOTDIR}etc/php/cli-php5.5/php.ini ${ROOTDIR}etc/php/cli-php5.6/php.ini ${ROOTDIR}etc/php/cli-php7.0/php.ini \ ${ROOTDIR}etc/php/embed-php7.1/php.ini ${ROOTDIR}etc/php/embed-php5.5/php.ini ${ROOTDIR}etc/php/embed-php5.6/php.ini ${ROOTDIR}etc/php/embed-php7.0/php.ini \ ${ROOTDIR}etc/php/fpm-php7.1/php.ini ${ROOTDIR}etc/php/fpm-php5.5/php.ini ${ROOTDIR}etc/php/fpm-php5.6/php.ini ${ROOTDIR}etc/php/fpm-php7.0/php.ini \ |