From: Andreas Schneider Date: Fri, 22 Apr 2022 13:34:09 +0000 (+0200) Subject: s3:tests: Reformat test_guest_auth.sh X-Git-Tag: talloc-2.3.4~122 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9079b356ad655c23ea0791c9cdc24ba0101976a;p=thirdparty%2Fsamba.git s3:tests: Reformat test_guest_auth.sh shfmt -f source3/script/| xargs shfmt -w -p -i 0 -fn Signed-off-by: Andreas Schneider Reviewed-by: Anoop C S Reviewed-by: Alexander Bokovoy --- diff --git a/source3/script/tests/test_guest_auth.sh b/source3/script/tests/test_guest_auth.sh index 4ad4a5cbd63..a64cb3ccdc2 100755 --- a/source3/script/tests/test_guest_auth.sh +++ b/source3/script/tests/test_guest_auth.sh @@ -6,10 +6,10 @@ # if [ $# -lt 5 ]; then -cat <&1) - bg_exists=$? - if [ $bg_exists != 0 ] ; then - printf "Group map for BUILTIN\\Guests must exist for test\n" - return 1 - fi - - SIDS=$($NET $CONFIGURATION groupmap listmem S-1-5-32-546) - if [ $? != 0 ] ; then - printf "$NET $CONFIGURATION groupmap listmem S-1-5-32-546 failed. Returned:\n" - printf "$SIDS\n" - return 1 - fi - printf "Got S-1-5-32-546 members:\n$SIDS\n" - - if [ "$SIDS" != "" ] ; then - for SID in $SIDS ; do - printf "Deleting member $SID from S-1-5-32-546\n" - $NET $CONFIGURATION groupmap delmem S-1-5-32-546 $SID || return 1 - done - fi - - return 0 +prepare_empty_builtin_guests() +{ + TMP=$($NET $CONFIGURATION groupmap listmem S-1-5-32-546 2>&1) + bg_exists=$? + if [ $bg_exists != 0 ]; then + printf "Group map for BUILTIN\\Guests must exist for test\n" + return 1 + fi + + SIDS=$($NET $CONFIGURATION groupmap listmem S-1-5-32-546) + if [ $? != 0 ]; then + printf "$NET $CONFIGURATION groupmap listmem S-1-5-32-546 failed. Returned:\n" + printf "$SIDS\n" + return 1 + fi + printf "Got S-1-5-32-546 members:\n$SIDS\n" + + if [ "$SIDS" != "" ]; then + for SID in $SIDS; do + printf "Deleting member $SID from S-1-5-32-546\n" + $NET $CONFIGURATION groupmap delmem S-1-5-32-546 $SID || return 1 + done + fi + + return 0 } -add_local_guest_to_builtin_guests() { - if [ "$SIDS" != "" ] ; then - for SID in $SIDS ; do - printf "Adding $SID as member to S-1-5-32-546\n" - $NET $CONFIGURATION groupmap addmem S-1-5-32-546 $SID || return 1 - done - fi +add_local_guest_to_builtin_guests() +{ + if [ "$SIDS" != "" ]; then + for SID in $SIDS; do + printf "Adding $SID as member to S-1-5-32-546\n" + $NET $CONFIGURATION groupmap addmem S-1-5-32-546 $SID || return 1 + done + fi } -test_smbclient() { - $SMBCLIENT -U foo%bar //$SERVER/tmpguest -c exit - if [ $? != 0 ] ; then - printf "smbclient failed\n" - return 1 - fi - return 0 +test_smbclient() +{ + $SMBCLIENT -U foo%bar //$SERVER/tmpguest -c exit + if [ $? != 0 ]; then + printf "smbclient failed\n" + return 1 + fi + return 0 } testit "smbclient_guest_at_startup" \ - test_smbclient || - failed=$(expr $failed + 1) + test_smbclient || + failed=$(expr $failed + 1) printf "Prepare BUILTIN\\Guests group mapping without members\n" prepare_empty_builtin_guests || { - printf "Setting up BUILTIN\\Guests without members failed\n" - exit 1 + printf "Setting up BUILTIN\\Guests without members failed\n" + exit 1 } $SMBCONTROL $CONFIGURATION smbd reload-config || { - printf "Reloading parent smbd guest info failed\n" - exit 1 + printf "Reloading parent smbd guest info failed\n" + exit 1 } testit "smbclient_guest_auth_without_members" \ - test_smbclient && - failed=$(expr $failed + 1) + test_smbclient && + failed=$(expr $failed + 1) # restore config add_local_guest_to_builtin_guests $SMBCONTROL $CONFIGURATION smbd reload-config || { - printf "Reloading parent smbd guest info failed\n" - exit 1 + printf "Reloading parent smbd guest info failed\n" + exit 1 } testit "smbclient_works_after_restored_setup" \ - test_smbclient || - failed=$(expr $failed + 1) + test_smbclient || + failed=$(expr $failed + 1) testok $0 $failed