sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

testprogs: Use --suppress-prompt instead of -s for testparm

Browse Source 
We should use long options in tests to make clear what we are trying to
do.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2021-04-09 14:33:09 +02:00 committed by Andrew Bartlett
parent fca9c56836
commit 86f7bc7a37
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testprogs/blackbox/test_weak_crypto.sh
View File

@ -32,7 +32,7 @@ opt="--option=gensec:gse_krb5=no -U${USERNAME}%${PASSWORD}"
unset GNUTLS_FORCE_FIPS_MODE
# Checks that testparm reports: Weak crypto is allowed
testit_grep "testparm" "Weak crypto is allowed" $samba_testparm -s $SMB_CONF_PATH 2>&1 || failed=`expr $failed + 1`
testit_grep "testparm" "Weak crypto is allowed" $samba_testparm --suppress-prompt $SMB_CONF_PATH 2>&1 || failed=`expr $failed + 1`
# We should be allowed to use NTLM for connecting
testit "rpclient.ntlm" $samba_rpcclient ncacn_np:$SERVER $opt -c "getusername" || failed=`expr $failed + 1`
@ -41,7 +41,7 @@ GNUTLS_FORCE_FIPS_MODE=1
export GNUTLS_FORCE_FIPS_MODE
# Checks that testparm reports: Weak crypto is disallowed
testit_grep "testparm" "Weak crypto is disallowed" $samba_testparm -s $SMB_CONF_PATH 2>&1 || failed=`expr $failed + 1`
testit_grep "testparm" "Weak crypto is disallowed" $samba_testparm --suppress-prompt $SMB_CONF_PATH 2>&1 || failed=`expr $failed + 1`
# We should not be allowed to use NTLM for connecting
testit_expect_failure "rpclient.ntlm" $samba_rpcclient ncacn_np:$SERVER $opt -c "getusername" || failed=`expr $failed + 1`

2
testprogs/blackbox/test_weak_crypto_server.sh
View File

@ -35,7 +35,7 @@ test_weak_crypto_allowed()
{
local testparm_stderr_output_path="$PREFIX/testparm_stderr_output"
$samba_testparm -s $configuration 2>$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