]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
testprogs: Reformat test_weak_disable_ntlmssp_ldap.sh
authorAndreas Schneider <asn@samba.org>
Fri, 22 Apr 2022 13:46:06 +0000 (15:46 +0200)
committerPavel Filipensky <pfilipensky@samba.org>
Wed, 10 Aug 2022 13:17:31 +0000 (13:17 +0000)
shfmt -w -p -i 0 -fn testprogs/blackbox/test_weak_disable_ntlmssp_ldap.sh

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
testprogs/blackbox/test_weak_disable_ntlmssp_ldap.sh

index 2822ab29d14d8b229cd0700026d6a2f692fa247d..efd6c974826529379bb68c7cc3c009efe21cc430 100755 (executable)
@@ -3,10 +3,10 @@
 # Copyright (c) 2022      Pavel Filipenský <pfilipen@redhat.com>
 
 if [ $# -lt 2 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: $0 USERNAME PASSWORD
 EOF
-exit 1;
+       exit 1
 fi
 
 USERNAME=$1
@@ -14,7 +14,7 @@ PASSWORD=$2
 shift 2
 
 failed=0
-. `dirname $0`/subunit.sh
+. $(dirname $0)/subunit.sh
 
 samba_testparm="$BINDIR/testparm"
 samba_net="$BINDIR/net"
@@ -22,19 +22,19 @@ samba_net="$BINDIR/net"
 unset GNUTLS_FORCE_FIPS_MODE
 
 # Checks that testparm reports: Weak crypto is allowed
-testit_grep "testparm" "Weak crypto is allowed" $samba_testparm --suppress-prompt $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 "net_ads_search.ntlm" $samba_net ads search --use-kerberos=off '(objectCategory=group)' sAMAccountName -U${USERNAME}%${PASSWORD} || failed=`expr $failed + 1`
+testit "net_ads_search.ntlm" $samba_net ads search --use-kerberos=off '(objectCategory=group)' sAMAccountName -U${USERNAME}%${PASSWORD} || failed=$(expr $failed + 1)
 
 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 --suppress-prompt $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_grep "net_ads_search.ntlm" "We can't fallback to NTLMSSP, weak crypto is disallowed." $samba_net ads search --use-kerberos=off -d10 '(objectCategory=group)' sAMAccountName -U${USERNAME}%${PASSWORD} || failed=`expr $failed + 1`
+testit_expect_failure_grep "net_ads_search.ntlm" "We can't fallback to NTLMSSP, weak crypto is disallowed." $samba_net ads search --use-kerberos=off -d10 '(objectCategory=group)' sAMAccountName -U${USERNAME}%${PASSWORD} || failed=$(expr $failed + 1)
 
 unset GNUTLS_FORCE_FIPS_MODE