From: Andreas Schneider Date: Fri, 22 Apr 2022 13:34:10 +0000 (+0200) Subject: s3:tests: Reformat test_sharesec.sh X-Git-Tag: tevent-0.13.0~443 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1a8afe650eb8e645d7a940ec89cf789436affb1;p=thirdparty%2Fsamba.git s3:tests: Reformat test_sharesec.sh shfmt -f source3/script/| xargs shfmt -w -p -i 0 -fn Signed-off-by: Andreas Schneider Reviewed-by: Guenther Deschner --- diff --git a/source3/script/tests/test_sharesec.sh b/source3/script/tests/test_sharesec.sh index ce1ada53e36..a083a56545a 100755 --- a/source3/script/tests/test_sharesec.sh +++ b/source3/script/tests/test_sharesec.sh @@ -11,7 +11,7 @@ if [ $# -lt 4 ]; then echo Usage: test_sharesec.sh SERVERCONFFILE SHARESEC NET SHARE -exit 1 + exit 1 fi CONF=$1 @@ -27,7 +27,7 @@ incdir=$(dirname $0)/../../../testprogs/blackbox failed=0 -testit "Set new ACL" $CMD --replace S-1-1-0:ALLOWED/0x0/READ || \ +testit "Set new ACL" $CMD --replace S-1-1-0:ALLOWED/0x0/READ || failed=$(expr $failed + 1) testit "Query new ACL" $CMD --view || failed=$(expr $failed + 1) COUNT=$($CMD --view | grep ACL: | sed -e 's/^ACL://' | wc -l) @@ -36,105 +36,105 @@ ACL=$($CMD --view | grep ACL: | sed -e 's/^ACL://') testit "Verify new ACL" test $ACL = S-1-1-0:ALLOWED/0x0/READ OWNER=$($CMD --view | grep OWNER:) -testit "Verify empty OWNER" test "$OWNER" = "OWNER:" || \ +testit "Verify empty OWNER" test "$OWNER" = "OWNER:" || failed=$(expr $failed + 1) GROUP=$($CMD --view | grep GROUP:) -testit "Verify empty GROUP" test "$GROUP" = "GROUP:" || \ +testit "Verify empty GROUP" test "$GROUP" = "GROUP:" || failed=$(expr $failed + 1) CONTROL=$($CMD --view | grep CONTROL: | sed -e 's/^CONTROL://') -testit "Verify control flags" test "$CONTROL" = "SR|DP" || \ +testit "Verify control flags" test "$CONTROL" = "SR|DP" || failed=$(expr $failed + 1) -testit "Add second ACL entry" $CMD --add S-1-5-32-544:ALLOWED/0x0/FULL || \ +testit "Add second ACL entry" $CMD --add S-1-5-32-544:ALLOWED/0x0/FULL || failed=$(expr $failed + 1) -testit "Query ACL with two entries" $CMD --view || \ +testit "Query ACL with two entries" $CMD --view || failed=$(expr $failed + 1) COUNT=$($CMD --view | grep ACL: | sed -e 's/^ACL://' | wc -l) -testit "Verify ACL count with two entries" test $COUNT -eq 2 || \ +testit "Verify ACL count with two entries" test $COUNT -eq 2 || failed=$(expr $failed + 1) ACL=$($CMD --view | grep S-1-5-32-544 | sed -e 's/^ACL://') -testit "Verify second ACL entry" test $ACL = S-1-5-32-544:ALLOWED/0x0/FULL || \ +testit "Verify second ACL entry" test $ACL = S-1-5-32-544:ALLOWED/0x0/FULL || failed=$(expr $failed + 1) -testit "Modify ACL entry" $CMD --modify S-1-5-32-544:ALLOWED/0x0/CHANGE || \ +testit "Modify ACL entry" $CMD --modify S-1-5-32-544:ALLOWED/0x0/CHANGE || failed=$(expr $failed + 1) -testit "Verify ACL with two entries after modify" $CMD --view || \ +testit "Verify ACL with two entries after modify" $CMD --view || failed=$(expr $failed + 1) COUNT=$($CMD --view | grep ACL: | sed -e 's/^ACL://' | wc -l) -testit "Verify ACL count with two entries after modify" test $COUNT -eq 2 || \ +testit "Verify ACL count with two entries after modify" test $COUNT -eq 2 || failed=$(expr $failed + 1) ACL=$($CMD --view | grep S-1-5-32-544 | sed -e 's/^ACL://') -testit "Verify modified entry" test $ACL = S-1-5-32-544:ALLOWED/0x0/CHANGE || \ +testit "Verify modified entry" test $ACL = S-1-5-32-544:ALLOWED/0x0/CHANGE || failed=$(expr $failed + 1) -testit "Add deny ACL entry" $CMD --add S-1-5-32-545:DENIED/0x0/CHANGE || \ +testit "Add deny ACL entry" $CMD --add S-1-5-32-545:DENIED/0x0/CHANGE || failed=$(expr $failed + 1) -testit "Query ACL with three entries" $CMD --view || \ +testit "Query ACL with three entries" $CMD --view || failed=$(expr $failed + 1) COUNT=$($CMD --view | grep ACL: | sed -e 's/^ACL://' | wc -l) -testit "Verify ACL count with three entries" test $COUNT -eq 3 || \ +testit "Verify ACL count with three entries" test $COUNT -eq 3 || failed=$(expr $failed + 1) ACL=$($CMD --view | grep S-1-5-32-545 | sed -e 's/^ACL://') -testit "Verify DENIED ACL entry" test $ACL = S-1-5-32-545:DENIED/0x0/CHANGE || \ +testit "Verify DENIED ACL entry" test $ACL = S-1-5-32-545:DENIED/0x0/CHANGE || failed=$(expr $failed + 1) -testit "Add special ACL entry" $CMD --add S-1-5-32-546:ALLOWED/0x0/RWXDP || \ +testit "Add special ACL entry" $CMD --add S-1-5-32-546:ALLOWED/0x0/RWXDP || failed=$(expr $failed + 1) -testit "Query ACL with four entries" $CMD --view || \ +testit "Query ACL with four entries" $CMD --view || failed=$(expr $failed + 1) COUNT=$($CMD --view | grep ACL: | sed -e 's/^ACL://' | wc -l) -testit "Verify ACL count with four entries" test $COUNT -eq 4 || \ +testit "Verify ACL count with four entries" test $COUNT -eq 4 || failed=$(expr $failed + 1) ACL=$($CMD --view | grep S-1-5-32-546 | sed -e 's/^ACL://') -testit "Verify special entry" test $ACL = S-1-5-32-546:ALLOWED/0x0/RWXDP || \ +testit "Verify special entry" test $ACL = S-1-5-32-546:ALLOWED/0x0/RWXDP || failed=$(expr $failed + 1) -testit "Remove ACL entry" $CMD --remove S-1-5-32-546:ALLOWED/0x0/RWXDP || \ +testit "Remove ACL entry" $CMD --remove S-1-5-32-546:ALLOWED/0x0/RWXDP || failed=$(expr $failed + 1) -testit "Query ACL with three entries after removal" $CMD --view || \ +testit "Query ACL with three entries after removal" $CMD --view || failed=$(expr $failed + 1) COUNT=$($CMD --view | grep ACL: | sed -e 's/^ACL://' | wc -l) -testit "Verify ACL count after removal" test $COUNT -eq 3 || \ +testit "Verify ACL count after removal" test $COUNT -eq 3 || failed=$(expr $failed + 1) ACL="$($CMD --view | grep S-1-5-32-546)" testit "Verify removal" test -e "$ACL" || failed=$(expr $failed + 1) -testit "Set ACL as hex value" $CMD --add S-1-5-32-547:0x1/0x0/0x001F01FF || \ +testit "Set ACL as hex value" $CMD --add S-1-5-32-547:0x1/0x0/0x001F01FF || failed=$(expr $failed + 1) ACL="$($CMD --view | grep S-1-5-32-547 | sed -e 's/^ACL://')" testit "Verify numerically set entry" \ - test "$ACL" = S-1-5-32-547:DENIED/0x0/FULL || \ + test "$ACL" = S-1-5-32-547:DENIED/0x0/FULL || failed=$(expr $failed + 1) -testit "Set ACL as dec value" $CMD --add S-1-5-32-548:1/0/0x001F01FF || \ +testit "Set ACL as dec value" $CMD --add S-1-5-32-548:1/0/0x001F01FF || failed=$(expr $failed + 1) ACL="$($CMD --view | grep S-1-5-32-548 | sed -e 's/^ACL://')" testit "Verify numerically set entry" \ - test "$ACL" = S-1-5-32-548:DENIED/0x0/FULL || \ + test "$ACL" = S-1-5-32-548:DENIED/0x0/FULL || failed=$(expr $failed + 1) -testit "Set back to default ACL " $CMD --replace S-1-1-0:ALLOWED/0x0/FULL || \ +testit "Set back to default ACL " $CMD --replace S-1-1-0:ALLOWED/0x0/FULL || failed=$(expr $failed + 1) -testit "Query standard ACL" $CMD --view || \ +testit "Query standard ACL" $CMD --view || failed=$(expr $failed + 1) COUNT=$($CMD --view | grep ACL: | sed -e 's/^ACL://' | wc -l) -testit "Verify standard ACL count" test $COUNT -eq 1 || \ +testit "Verify standard ACL count" test $COUNT -eq 1 || failed=$(expr $failed + 1) ACL=$($CMD --view | grep ACL: | sed -e 's/^ACL://') -testit "Verify standard ACL" test $ACL = S-1-1-0:ALLOWED/0x0/FULL || \ +testit "Verify standard ACL" test $ACL = S-1-1-0:ALLOWED/0x0/FULL || failed=$(expr $failed + 1) -testit "Create new share" $NET_CMD conf addshare tmp_share /tmp || \ +testit "Create new share" $NET_CMD conf addshare tmp_share /tmp || failed=$(expr $failed + 1) -testit "Change ACL" $SHARESEC $CONF --replace S-1-1-0:DENIED/0x0/FULL tmp_share || \ +testit "Change ACL" $SHARESEC $CONF --replace S-1-1-0:DENIED/0x0/FULL tmp_share || failed=$(expr $failed + 1) -testit "Delete share" $NET_CMD conf delshare tmp_share || \ +testit "Delete share" $NET_CMD conf delshare tmp_share || failed=$(expr $failed + 1) -testit "Create share again" $NET_CMD conf addshare tmp_share /tmp || \ +testit "Create share again" $NET_CMD conf addshare tmp_share /tmp || failed=$(expr $failed + 1) ACL=$($SHARESEC $CONF --view tmp_share | grep 'ACL:') testit "Check for default ACL" \ - test "$ACL" = "ACL:S-1-1-0:ALLOWED/0x0/FULL" || \ + test "$ACL" = "ACL:S-1-1-0:ALLOWED/0x0/FULL" || failed=$(expr $failed + 1) testok $0 $failed