From: Andreas Schneider <asn@samba.org>
Date: Tue, 21 Mar 2023 08:26:24 +0000 (+0100)
Subject: testprogs: Fix shell arithmetic in test_export_keytab_heimdal.sh
X-Git-Tag: talloc-2.4.1~1000
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e560cf8ae1f73ac4b098ed8bd4a6ea1f58c9b09b;p=thirdparty%2Fsamba.git

testprogs: Fix shell arithmetic in test_export_keytab_heimdal.sh

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/testprogs/blackbox/test_export_keytab_heimdal.sh b/testprogs/blackbox/test_export_keytab_heimdal.sh
index 4da3f02d2be..c44ba252262 100755
--- a/testprogs/blackbox/test_export_keytab_heimdal.sh
+++ b/testprogs/blackbox/test_export_keytab_heimdal.sh
@@ -66,18 +66,18 @@ unc="//$SERVER/tmp"
 
 testit "create user locally" \
 	$VALGRIND $PYTHON $newuser ${TEST_USER} $USERPASS "$@" || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 
 testit "dump keytab from domain" \
 	$VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab \
 	"${CONFIGURATION}" "$@" || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 test_keytab "read keytab from domain" \
 	"$PREFIX/tmpkeytab" "$SERVER\\\$" 3
 testit "dump keytab from domain (2nd time)" \
 	$VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab \
 	"${CONFIGURATION}" "$@" || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 test_keytab "read keytab from domain (2nd time)" \
 	"$PREFIX/tmpkeytab" "$SERVER\\\$" 3
 
@@ -85,35 +85,35 @@ testit "dump keytab from domain for cifs principal" \
 	$VALGRIND $PYTHON \
 	$samba_tool domain exportkeytab $PREFIX/tmpkeytab-server \
 	--principal=cifs/$SERVER_FQDN "${CONFIGURATION}" "$@" || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 test_keytab "read keytab from domain for cifs principal" \
 	"$PREFIX/tmpkeytab-server" "cifs/$SERVER_FQDN" 3
 testit "dump keytab from domain for cifs principal (2nd time)" \
 	$VALGRIND $PYTHON \
 	$samba_tool domain exportkeytab $PREFIX/tmpkeytab-server \
 	--principal=cifs/$SERVER_FQDN "${CONFIGURATION}" "$@" || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 test_keytab "read keytab from domain for cifs principal (2nd time)" \
 	"$PREFIX/tmpkeytab-server" "cifs/$SERVER_FQDN" 3
 
 testit "dump keytab from domain for user principal" \
 	$VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-2 \
 	--principal=${TEST_USER} "${CONFIGURATION}" "$@" || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 test_keytab "dump keytab from domain for user principal" \
 	"$PREFIX/tmpkeytab-2" "${TEST_USER}@$REALM" 3
 testit "dump keytab from domain for user principal (2nd time)" \
 	$VALGRIND $PYTHON \
 	$samba_tool domain exportkeytab $PREFIX/tmpkeytab-2 \
 	--principal=${TEST_USER}@$REALM "${CONFIGURATION}" "$@" || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 test_keytab "dump keytab from domain for user principal (2nd time)" \
 	"$PREFIX/tmpkeytab-2" "${TEST_USER}@$REALM" 3
 
 testit "dump keytab from domain for user principal with SPN as UPN" \
 	$VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-3 \
 	--principal=http/testupnspn.$DNSDOMAIN "${CONFIGURATION}" "$@" || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 test_keytab "dump keytab from domain for user principal" \
 	"$PREFIX/tmpkeytab-3" "http/testupnspn.$DNSDOMAIN@$REALM" 3
 
@@ -124,20 +124,20 @@ export KRB5CCNAME
 testit "kinit with keytab as user" \
 	$VALGRIND $samba4kinit --keytab=$PREFIX/tmpkeytab --request-pac \
 	${TEST_USER}@$REALM || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 
 test_smbclient "Test login with user kerberos ccache" \
 	'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 
 testit "kinit with keytab as user (2)" \
 	$VALGRIND $samba4kinit --keytab=$PREFIX/tmpkeytab-2 --request-pac \
 	${TEST_USER}@$REALM || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 
 test_smbclient "Test login with user kerberos ccache as user (2)" \
 	'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 
 KRB5CCNAME="$PREFIX/tmpadminccache"
 samba4kinit="$samba4kinit_binary -c $KRB5CCNAME"
@@ -146,7 +146,7 @@ export KRB5CCNAME
 testit "kinit with keytab as $USERNAME" \
 	$VALGRIND $samba4kinit --keytab=$PREFIX/tmpkeytab --request-pac \
 	$USERNAME@$REALM || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 
 KRB5CCNAME="$PREFIX/tmpspnupnccache"
 samba4kinit="$samba4kinit_binary -c $KRB5CCNAME"
@@ -154,7 +154,7 @@ export KRB5CCNAME
 testit "kinit with SPN from keytab" \
 	$VALGRIND $samba4kinit -k -t $PREFIX/tmpkeytab-3 \
 	http/testupnspn.$DNSDOMAIN || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 
 KRB5CCNAME="$PREFIX/tmpadminccache"
 samba4kinit="$samba4kinit_binary -c $KRB5CCNAME"
@@ -163,7 +163,7 @@ export KRB5CCNAME
 testit "del user" \
 	$VALGRIND $PYTHON $samba_tool user delete ${TEST_USER} \
 	-k yes "${CONFIGURATION}" "$@" || \
-	failed=$(expr $failed + 1)
+	failed=$((failed + 1))
 
 rm -f $PREFIX/tmpadminccache $PREFIX/tmpuserccache $PREFIX/tmpkeytab $PREFIX/tmpkeytab-2 $PREFIX/tmpkeytab-2 $PREFIX/tmpkeytab-server $PREFIX/tmpspnupnccache
 exit $failed