From 9a5be8b68ba38e0d98329c44d0d5c6d4579c9bf5 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 27 Mar 2017 22:07:50 -0700 Subject: [PATCH] s3: Fixup test for CVE-2017-2619 regression with "follow symlinks = no" Use correct bash operators (not string operators). Add missing "return". BUG: https://bugzilla.samba.org/show_bug.cgi?id=12721 Signed-off-by: Jeremy Allison Reviewed-by: Ralph Boehme (cherry picked from commit 037297a1c50e90a0092e3b94f472623f41ccc015) --- source3/script/tests/test_smbclient_s3.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh index f13fd348fe5..bf55d0207d6 100755 --- a/source3/script/tests/test_smbclient_s3.sh +++ b/source3/script/tests/test_smbclient_s3.sh @@ -1098,7 +1098,7 @@ EOF ret=$? rm -f $tmpfile - if [ $ret != 0 ] ; then + if [ $ret -ne 0 ] ; then echo "$out" echo "failed accessing nosymlinks with error $ret" false @@ -1107,10 +1107,11 @@ EOF echo "$out" | grep 'NT_STATUS_ACCESS_DENIED' ret=$? - if [ $ret != 0 ] ; then + if [ $ret -ne 0 ] ; then echo "$out" echo "failed - should get NT_STATUS_ACCESS_DENIED getting \\nosymlinks\\source" false + return fi # But we should be able to create and delete directories. @@ -1125,7 +1126,7 @@ EOF ret=$? rm -f $tmpfile - if [ $ret != 0 ] ; then + if [ $ret -ne 0 ] ; then echo "$out" echo "failed accessing nosymlinks with error $ret" false @@ -1134,7 +1135,7 @@ EOF echo "$out" | grep 'NT_STATUS' ret=$? - if [ $ret == 0 ] ; then + if [ $ret -eq 0 ] ; then echo "$out" echo "failed - NT_STATUS_XXXX doing mkdir a; mkdir a\\b on \\nosymlinks" false -- 2.47.2