diff options
author | Andreas Schneider <asn@samba.org> | 2023-03-21 09:34:52 +0100 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2023-04-06 13:45:35 +0000 |
commit | deb9d1f65656057fc0d24a8418592e1c61e612e8 (patch) | |
tree | 645b1966cb389d5ee774916bc018e7a8c93363bf /testprogs | |
parent | 245990998fd118a4e5a4ea3a1ac95224a5635e51 (diff) | |
download | samba-deb9d1f65656057fc0d24a8418592e1c61e612e8.tar.gz |
testprogs: Fix shell arithmetic in test_export_keytab_mit.sh
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'testprogs')
-rwxr-xr-x | testprogs/blackbox/test_export_keytab_mit.sh | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/testprogs/blackbox/test_export_keytab_mit.sh b/testprogs/blackbox/test_export_keytab_mit.sh index 36575f2ed37..2de8edce62e 100755 --- a/testprogs/blackbox/test_export_keytab_mit.sh +++ b/testprogs/blackbox/test_export_keytab_mit.sh @@ -93,19 +93,19 @@ fi testit "create local user $TEST_USER" \ $VALGRIND $PYTHON $samba_newuser $TEST_USER $TEST_PASSWORD \ "${CONFIGURATION}" "$@" || \ - failed=$(expr $failed + 1) + failed=$((failed + 1)) testit "dump keytab from domain" \ $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-all \ "${CONFIGURATION}" "$@" || \ - failed=$(expr $failed + 1) + failed=$((failed + 1)) test_keytab "read keytab from domain" \ "$PREFIX/tmpkeytab-all" "$SERVER\\\$" $EXPECTED_NKEYS testit "dump keytab from domain (2nd time)" \ $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-all \ "${CONFIGURATION}" "$@" || \ - failed=$(expr $failed + 1) + failed=$((failed + 1)) test_keytab "read keytab from domain (2nd time)" \ "$PREFIX/tmpkeytab-all" "$SERVER\\\$" $EXPECTED_NKEYS @@ -113,14 +113,14 @@ testit "dump keytab from domain for cifs service 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 service principal" \ "$PREFIX/tmpkeytab-server" "cifs/$SERVER_FQDN" $EXPECTED_NKEYS testit "dump keytab from domain for cifs service 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 service principal (2nd time)" \ "$PREFIX/tmpkeytab-server" "cifs/$SERVER_FQDN" $EXPECTED_NKEYS @@ -128,14 +128,14 @@ testit "dump keytab from domain for user principal" \ $VALGRIND $PYTHON $samba_tool domain exportkeytab \ $PREFIX/tmpkeytab-user-princ --principal=$TEST_USER \ "${CONFIGURATION}" "$@" || \ - failed=$(expr $failed + 1) + failed=$((failed + 1)) test_keytab "dump keytab from domain for user principal" \ "$PREFIX/tmpkeytab-user-princ" "$TEST_USER@$REALM" $EXPECTED_NKEYS testit "dump keytab from domain for user principal (2nd time)" \ $VALGRIND $PYTHON $samba_tool domain exportkeytab \ $PREFIX/tmpkeytab-user-princ --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-user-princ" "$TEST_USER@$REALM" $EXPECTED_NKEYS @@ -145,19 +145,19 @@ export KRB5CCNAME testit "kinit with keytab as user" \ $VALGRIND $samba_kinit -k -t $PREFIX/tmpkeytab-all \ $TEST_USER@$REALM || \ - failed=$(expr $failed + 1) + failed=$((failed + 1)) test_smbclient "Test login with user kerberos ccache" \ 'ls' --use-krb5-ccache="${KRB5CCNAME}" || \ - failed=$(expr $failed + 1) + failed=$((failed + 1)) $samba_kdestroy testit "kinit with keytab as user (one princ)" \ $VALGRIND $samba_kinit -k -t $PREFIX/tmpkeytab-user-princ \ $TEST_USER@$REALM || \ - failed=$(expr $failed + 1) + failed=$((failed + 1)) test_smbclient "Test login with user kerberos ccache (one princ)" \ 'ls' --use-krb5-ccache="${KRB5CCNAME}" || \ - failed=$(expr $failed + 1) + failed=$((failed + 1)) $samba_kdestroy KRB5CCNAME="$PREFIX/tmpadminccache" @@ -165,7 +165,7 @@ export KRB5CCNAME testit "kinit with keytab as $USERNAME" \ $VALGRIND $samba_kinit -k -t $PREFIX/tmpkeytab-all $USERNAME@$REALM || \ - failed=$(expr $failed + 1) + failed=$((failed + 1)) KRB5CCNAME="$PREFIX/tmpserverccache" export KRB5CCNAME @@ -173,13 +173,13 @@ echo "$samba_kinit -k -t $PREFIX/tmpkeytab-server cifs/$SERVER_FQDN" testit "kinit with SPN from keytab" \ $VALGRIND $samba_kinit -k -t $PREFIX/tmpkeytab-server \ cifs/$SERVER_FQDN || \ - failed=$(expr $failed + 1) + failed=$((failed + 1)) # cleanup testit "delete user $TEST_USER" \ $VALGRIND $PYTHON $samba_tool user delete "${TEST_USER}" \ --use-krb5-ccache="${KRB5CCNAME}" "${CONFIGURATION}" "$@" || \ - failed=$(expr $failed + 1) + failed=$((failed + 1)) $samba_kdestroy rm -f $PREFIX/tmpadminccache \ |