From: Andreas Schneider Date: Fri, 22 Apr 2022 13:46:06 +0000 (+0200) Subject: testprogs: Reformat test_weak_crypto_server.sh X-Git-Tag: talloc-2.4.0~1498 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4973baf665fda140fb861adc9127e7a3a0799c9b;p=thirdparty%2Fsamba.git testprogs: Reformat test_weak_crypto_server.sh shfmt -w -p -i 0 -fn testprogs/blackbox/test_weak_crypto_server.sh Signed-off-by: Andreas Schneider Reviewed-by: Pavel Filipenský --- diff --git a/testprogs/blackbox/test_weak_crypto_server.sh b/testprogs/blackbox/test_weak_crypto_server.sh index fcd266d904b..8bcd7cbc680 100755 --- a/testprogs/blackbox/test_weak_crypto_server.sh +++ b/testprogs/blackbox/test_weak_crypto_server.sh @@ -6,10 +6,10 @@ # if [ $# -lt 7 ]; then -cat <$testparm_stderr_output_path >/dev/null + $samba_testparm --suppress-prompt $configuration 2>$testparm_stderr_output_path >/dev/null - grep "Weak crypto is allowed" $testparm_stderr_output_path >/dev/null 2>&1 - if [ $ret -ne 0 ]; then - echo "Invalid crypto state:" - cat $testparm_stderr_output_path - rm -f $testparm_stderr_output_path - return 1 - fi + grep "Weak crypto is allowed" $testparm_stderr_output_path >/dev/null 2>&1 + if [ $ret -ne 0 ]; then + echo "Invalid crypto state:" + cat $testparm_stderr_output_path + rm -f $testparm_stderr_output_path + return 1 + fi - rm -f $testparm_stderr_output_path + rm -f $testparm_stderr_output_path - return 0 + return 0 } unset GNUTLS_FORCE_FIPS_MODE # Checks that testparm reports: Weak crypto is disallowed -testit "testparm-weak-crypto" test_weak_crypto_allowed || failed=`expr $failed + 1` +testit "testparm-weak-crypto" test_weak_crypto_allowed || failed=$(expr $failed + 1) # We should not be allowed to use NTLM for connecting -testit_expect_failure "rpclient.ntlm" $samba_rpcclient ncacn_np:$SERVER_IP[ntlm] -U$USERNAME%$PASSWORD -c "getusername" && failed=`expr $failed + 1` +testit_expect_failure "rpclient.ntlm" $samba_rpcclient ncacn_np:$SERVER_IP[ntlm] -U$USERNAME%$PASSWORD -c "getusername" && failed=$(expr $failed + 1) GNUTLS_FORCE_FIPS_MODE=1 export GNUTLS_FORCE_FIPS_MODE