diff --git a/source3/script/tests/test_close_denied_share.sh b/source3/script/tests/test_close_denied_share.sh index 58850e754e3..056b8cf30df 100755 --- a/source3/script/tests/test_close_denied_share.sh +++ b/source3/script/tests/test_close_denied_share.sh @@ -5,9 +5,9 @@ # Copyright (C) 2020 Volker Lendecke if [ $# -lt 6 ]; then - echo Usage: test_close_denied_share.sh \ - SERVERCONFFILE SHARESEC SMBCLIENT SMBCONTROL IP SHARE -exit 1 + echo Usage: test_close_denied_share.sh \ + SERVERCONFFILE SHARESEC SMBCLIENT SMBCONTROL IP SHARE + exit 1 fi CONF=$1 @@ -27,51 +27,52 @@ cd $SELFTEST_TMPDIR || exit 1 rm -f smbclient-stdin smbclient-stdout mkfifo smbclient-stdin smbclient-stdout -CLI_FORCE_INTERACTIVE=1; export CLI_FORCE_INTERACTIVE +CLI_FORCE_INTERACTIVE=1 +export CLI_FORCE_INTERACTIVE ${SMBCLIENT} //${SERVER}/${SHARE} ${CONF} -U${USER}%${PASSWORD} \ - < smbclient-stdin > smbclient-stdout & + smbclient-stdout & CLIENT_PID=$! sleep 1 -exec 100>smbclient-stdin 101smbclient-stdin 101&100 COUNT=$(head -n 2 <&101 | - grep NT_STATUS_NETWORK_NAME_DELETED | - wc -l) + grep NT_STATUS_NETWORK_NAME_DELETED | + wc -l) testit "Verify close-denied-share did not kill valid client" \ - test $COUNT -eq 0 || failed=$(expr $failed + 1) + test $COUNT -eq 0 || failed=$(expr $failed + 1) testit "Deny access" ${SHARESEC} ${CONF} --replace S-1-1-0:DENIED/0x0/FULL \ - ${SHARE} || failed=$(expr $failed + 1) + ${SHARE} || failed=$(expr $failed + 1) testit "smbcontrol" ${SMBCONTROL} ${CONF} smbd close-denied-share ${SHARE} || - failed=$(expr $failed + 1) + failed=$(expr $failed + 1) sleep 1 echo dir >&100 COUNT=$(head -n 2 <&101 | - grep NT_STATUS_NETWORK_NAME_DELETED | - wc -l) + grep NT_STATUS_NETWORK_NAME_DELETED | + wc -l) testit "Verify close-denied-share did kill now-invalid client" \ - test $COUNT -eq 1 || failed=$(expr $failed + 1) + test $COUNT -eq 1 || failed=$(expr $failed + 1) kill ${CLIENT_PID} rm -f smbclient-stdin smbclient-stdout testit "Allow access" ${SHARESEC} ${CONF} --replace S-1-1-0:ALLOWED/0x0/FULL \ - ${SHARE} || failed=$(expr $failed + 1) + ${SHARE} || failed=$(expr $failed + 1) testok $0 $failed