From edf0433204e375619a0158fb61a4b30327435fd1 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 13 Jun 2022 15:37:11 +0200 Subject: testprogs: Fix shellcheck errors in test_export_keytab_heimdal.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit testprogs/blackbox/test_export_keytab_heimdal.sh:65:79: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_export_keytab_heimdal.sh:67:102: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_export_keytab_heimdal.sh:69:113: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_export_keytab_heimdal.sh:72:158: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_export_keytab_heimdal.sh:74:169: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_export_keytab_heimdal.sh:77:147: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_export_keytab_heimdal.sh:79:165: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_export_keytab_heimdal.sh:82:178: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_export_keytab_heimdal.sh:112:80: error: Double quote array expansions to avoid re-splitting elements. [SC2068] Signed-off-by: Andreas Schneider Reviewed-by: Pavel Filipenský --- testprogs/blackbox/test_export_keytab_heimdal.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'testprogs') diff --git a/testprogs/blackbox/test_export_keytab_heimdal.sh b/testprogs/blackbox/test_export_keytab_heimdal.sh index f2cec4c31dc..7c0d92b7cc7 100755 --- a/testprogs/blackbox/test_export_keytab_heimdal.sh +++ b/testprogs/blackbox/test_export_keytab_heimdal.sh @@ -62,24 +62,28 @@ test_keytab() USERPASS=testPaSS@01% unc="//$SERVER/tmp" -testit "create user locally" $VALGRIND $PYTHON $newuser nettestuser $USERPASS $@ || failed=$(expr $failed + 1) +testit "create user locally" $VALGRIND $PYTHON $newuser nettestuser $USERPASS "$@" || failed=$(expr $failed + 1) -testit "dump keytab from domain" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab $@ || failed=$(expr $failed + 1) +testit "dump keytab from domain" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab "$@" || failed=$(expr $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 $@ || failed=$(expr $failed + 1) +testit "dump keytab from domain (2nd time)" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab "$@" || failed=$(expr $failed + 1) test_keytab "read keytab from domain (2nd time)" "$PREFIX/tmpkeytab" "$SERVER\\\$" 3 -testit "dump keytab from domain for cifs principal" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-server --principal=cifs/$SERVER_FQDN $@ || failed=$(expr $failed + 1) +testit "dump keytab from domain for cifs principal" $VALGRIND $PYTHON +$samba_tool domain exportkeytab $PREFIX/tmpkeytab-server --principal=cifs/$SERVER_FQDN "$@" || failed=$(expr $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 $@ || failed=$(expr $failed + 1) +testit "dump keytab from domain for cifs principal (2nd time)" $VALGRIND $PYTHON +$samba_tool domain exportkeytab $PREFIX/tmpkeytab-server --principal=cifs/$SERVER_FQDN "$@" || failed=$(expr $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=nettestuser $@ || failed=$(expr $failed + 1) +testit "dump keytab from domain for user principal" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-2 --principal=nettestuser "$@" || failed=$(expr $failed + 1) test_keytab "dump keytab from domain for user principal" "$PREFIX/tmpkeytab-2" "nettestuser@$REALM" 3 -testit "dump keytab from domain for user principal (2nd time)" $VALGRIND $PYTHON $samba_tool domain exportkeytab $PREFIX/tmpkeytab-2 --principal=nettestuser@$REALM $@ || failed=$(expr $failed + 1) +testit "dump keytab from domain for user principal (2nd time)" $VALGRIND $PYTHON +$samba_tool domain exportkeytab $PREFIX/tmpkeytab-2 --principal=nettestuser@$REALM "$@" || failed=$(expr $failed + 1) test_keytab "dump keytab from domain for user principal (2nd time)" "$PREFIX/tmpkeytab-2" "nettestuser@$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 $@ || failed=$(expr $failed + 1) +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 "$@" || failed=$(expr $failed + 1) test_keytab "dump keytab from domain for user principal" "$PREFIX/tmpkeytab-3" "http/testupnspn.$DNSDOMAIN@$REALM" 3 KRB5CCNAME="$PREFIX/tmpuserccache" @@ -109,7 +113,7 @@ KRB5CCNAME="$PREFIX/tmpadminccache" samba4kinit="$samba4kinit_binary -c $KRB5CCNAME" export KRB5CCNAME -testit "del user" $VALGRIND $PYTHON $samba_tool user delete nettestuser -k yes $@ || failed=$(expr $failed + 1) +testit "del user" $VALGRIND $PYTHON $samba_tool user delete nettestuser -k yes "$@" || failed=$(expr $failed + 1) rm -f $PREFIX/tmpadminccache $PREFIX/tmpuserccache $PREFIX/tmpkeytab $PREFIX/tmpkeytab-2 $PREFIX/tmpkeytab-2 $PREFIX/tmpkeytab-server $PREFIX/tmpspnupnccache exit $failed -- cgit v1.2.1