s3:tests: Reformat test_large_acl.sh

[samba.git] / source3 / script / tests / test_large_acl.sh

diff --git a/source3/script/tests/test_large_acl.sh b/source3/script/tests/test_large_acl.sh
index d18c098b512e0720f0887917f4e4a2db03d4239f..b80034a1438fc981ab1310f95d52e1ca978b675a 100755 (executable)
--- a/source3/script/tests/test_large_acl.sh
+++ b/source3/script/tests/test_large_acl.sh
@@ -4,10 +4,10 @@
 #
 
 if [ $# -lt 5 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: $0 SERVER USERNAME PASSWORD SMBCLIENT SMBCACLS PARAMS
 EOF
-exit 1;
+       exit 1
 fi
 
 SERVER=${1}
@@ -20,7 +20,7 @@ ADDARGS="$*"
 SMBCLIENT="$VALGRIND ${SMBCLIENT} ${ADDARGS}"
 SMBCACLS="$VALGRIND ${SMBCACLS} ${ADDARGS}"
 
-incdir=`dirname $0`/../../../testprogs/blackbox
+incdir=$(dirname $0)/../../../testprogs/blackbox
 . $incdir/subunit.sh
 
 cd $SELFTEST_TMPDIR || exit 1
@@ -28,33 +28,33 @@ cd $SELFTEST_TMPDIR || exit 1
 # build a file to work with
 build_files()
 {
-    touch large_acl
-    $SMBCLIENT //$SERVER/acl_xattr_ign_sysacl_windows -U $USERNAME%$PASSWORD -c 'put large_acl' > /dev/null 2>&1
-    rm -rf large_acl > /dev/null
+       touch large_acl
+       $SMBCLIENT //$SERVER/acl_xattr_ign_sysacl_windows -U $USERNAME%$PASSWORD -c 'put large_acl' >/dev/null 2>&1
+       rm -rf large_acl >/dev/null
 }
 
 cleanup()
 {
-    $SMBCLIENT //$SERVER/acl_xattr_ign_sysacl_windows -U $USERNAME%$PASSWORD -c 'rm large_acl' > /dev/null 2>&1
+       $SMBCLIENT //$SERVER/acl_xattr_ign_sysacl_windows -U $USERNAME%$PASSWORD -c 'rm large_acl' >/dev/null 2>&1
 }
 
 build_files
 
 test_large_acl()
 {
-    #An ACL with 200 entries, ~7K
-    new_acl=$(seq 1001 1200 | sed -r -e '1 i\D:(A;;0x001f01ff;;;WD)' -e 's/(.*)/(A;;0x001f01ff;;;S-1-5-21-11111111-22222222-33333333-\1)/' | tr -d '\n')
-    $SMBCACLS //$SERVER/acl_xattr_ign_sysacl_windows -U $USERNAME%$PASSWORD --sddl -S $new_acl large_acl
-    actual_acl=$($SMBCACLS //$SERVER/acl_xattr_ign_sysacl_windows -U $USERNAME%$PASSWORD --sddl --numeric large_acl 2>/dev/null | sed -rn 's/.*(D:.*)/\1/p' | tr -d '\n')
-    if [ ! "$new_acl" = "$actual_acl" ] ; then
-        echo -e "expected:\n$new_acl\nactual:\n$actual_acl\n"
-        return 1
-    fi
+       #An ACL with 200 entries, ~7K
+       new_acl=$(seq 1001 1200 | sed -r -e '1 i\D:(A;;0x001f01ff;;;WD)' -e 's/(.*)/(A;;0x001f01ff;;;S-1-5-21-11111111-22222222-33333333-\1)/' | tr -d '\n')
+       $SMBCACLS //$SERVER/acl_xattr_ign_sysacl_windows -U $USERNAME%$PASSWORD --sddl -S $new_acl large_acl
+       actual_acl=$($SMBCACLS //$SERVER/acl_xattr_ign_sysacl_windows -U $USERNAME%$PASSWORD --sddl --numeric large_acl 2>/dev/null | sed -rn 's/.*(D:.*)/\1/p' | tr -d '\n')
+       if [ ! "$new_acl" = "$actual_acl" ]; then
+               echo -e "expected:\n$new_acl\nactual:\n$actual_acl\n"
+               return 1
+       fi
 }
 
 failed=0
 
-testit "able to retrieve a large ACL if VFS supports it" test_large_acl || failed=`expr $failed + 1`
+testit "able to retrieve a large ACL if VFS supports it" test_large_acl || failed=$(expr $failed + 1)
 
 cleanup