diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2019-07-16 14:20:30 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2019-07-16 14:20:30 +0300 |
| commit | fa8bad20db100d95cf089b0b2d897c339327215c (patch) | |
| tree | 2f80f2e015d26056cd741137dc4fdd069a6c4c5d /include/tests_storage_nfs | |
| parent | 2777caf6d218aeb40c2ebd8af2564be8201eeff1 (diff) | |
Use -n instead of ! -z
Diffstat (limited to 'include/tests_storage_nfs')
| -rw-r--r-- | include/tests_storage_nfs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/tests_storage_nfs b/include/tests_storage_nfs index 4c0e39ef..bfc5192d 100644 --- a/include/tests_storage_nfs +++ b/include/tests_storage_nfs @@ -33,7 +33,7 @@ # # Test : STRG-1902 # Description : Check rpcinfo - if [ ! -z "${RPCINFOBINARY}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi + if [ -n "${RPCINFOBINARY}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no STRG-1902 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check rpcinfo registered programs" if [ ${SKIPTEST} -eq 0 ]; then LogText "Test: Checking rpcinfo registered programs" @@ -48,7 +48,7 @@ # # Test : STRG-1904 # Description : Check nfs versions in rpcinfo - if [ ! -z "${RPCINFOBINARY}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi + if [ -n "${RPCINFOBINARY}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no STRG-1904 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check nfs rpc" if [ ${SKIPTEST} -eq 0 ]; then LogText "Test: Checking NFS registered versions" @@ -63,7 +63,7 @@ # # Test : STRG-1906 # Description : Check nfs protocols (TCP/UDP) and port in rpcinfo - if [ ! -z "${RPCINFOBINARY}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi + if [ -n "${RPCINFOBINARY}" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi Register --test-no STRG-1906 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check nfs rpc" if [ ${SKIPTEST} -eq 0 ]; then LogText "Test: Checking NFS registered protocols" @@ -123,7 +123,7 @@ if [ -f ${ROOTDIR}etc/exports ]; then LogText "Result: ${ROOTDIR}etc/exports exists" FIND=$(${GREPBINARY} -v "^$" ${ROOTDIR}etc/exports | ${GREPBINARY} -v "^#" | ${SEDBINARY} 's/ /!space!/g') - if [ ! -z "${FIND}" ]; then + if [ -n "${FIND}" ]; then for I in ${FIND}; do I=$(echo ${I} | ${SEDBINARY} 's/!space!/ /g') LogText "Found line: ${I}" @@ -161,7 +161,7 @@ Register --test-no STRG-1930 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check client access to nfs share" if [ ${SKIPTEST} -eq 0 ]; then sFIND=$(${SHOWMOUNTBINARY} -e | ${AWKBINARY} '{ print $2 }' | ${SEDBINARY} '1d' | ${GREPBINARY} "\*") - if [ ! -z "${sFIND}" ]; then + if [ -n "${sFIND}" ]; then LogText "Result: all client are allowed to access a NFS share in /etc/exports" Display --indent 4 --text "- Checking NFS client access" --result "ALL CLIENTS" --color YELLOW ReportSuggestion ${TEST_NO} "Specify clients that are allowed to access a NFS share /etc/exports" |