From: Andreas Schneider Date: Mon, 13 Jun 2022 13:52:58 +0000 (+0200) Subject: testprogs: Fix shellcheck errors in test_kinit_heimdal.sh X-Git-Tag: talloc-2.4.0~1351 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=391d0cf667d9e58aa7539e26ec991870d92a598d;p=thirdparty%2Fsamba.git testprogs: Fix shellcheck errors in test_kinit_heimdal.sh testprogs/blackbox/test_kinit_heimdal.sh:83:107: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_kinit_heimdal.sh:87:126: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_kinit_heimdal.sh:101:126: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_kinit_heimdal.sh:103:154: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_kinit_heimdal.sh:105:112: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_kinit_heimdal.sh:118:195: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_kinit_heimdal.sh:145:154: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_kinit_heimdal.sh:217:122: error: Double quote array expansions to avoid re-splitting elements. [SC2068] testprogs/blackbox/test_kinit_heimdal.sh:251:116: error: Double quote array expansions to avoid re-splitting elements. [SC2068] Signed-off-by: Andreas Schneider Reviewed-by: Pavel Filipenský --- diff --git a/testprogs/blackbox/test_kinit_heimdal.sh b/testprogs/blackbox/test_kinit_heimdal.sh index 2db03da076f..73b002fb1fe 100755 --- a/testprogs/blackbox/test_kinit_heimdal.sh +++ b/testprogs/blackbox/test_kinit_heimdal.sh @@ -80,11 +80,11 @@ testit "kinit renew ticket" $samba4kinit $enctype --request-pac -R test_smbclient "Test login with kerberos ccache" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$(expr $failed + 1) -testit "check time with kerberos ccache" $VALGRIND $PYTHON $samba_tool time $SERVER $CONFIGURATION -k yes $@ || failed=$(expr $failed + 1) +testit "check time with kerberos ccache" $VALGRIND $PYTHON $samba_tool time $SERVER $CONFIGURATION -k yes "$@" || failed=$(expr $failed + 1) USERPASS=testPass@12% echo $USERPASS >$PREFIX/tmpuserpassfile -testit "add user with kerberos ccache" $VALGRIND $PYTHON $samba_tool user create nettestuser $USERPASS $CONFIGURATION -k yes $@ || failed=$(expr $failed + 1) +testit "add user with kerberos ccache" $VALGRIND $PYTHON $samba_tool user create nettestuser $USERPASS $CONFIGURATION -k yes "$@" || failed=$(expr $failed + 1) echo "Getting defaultNamingContext" BASEDN=$($ldbsearch $options --basedn='' -H ldap://$SERVER --scope=base DUMMY=x defaultNamingContext | grep defaultNamingContext | awk '{print $2}') @@ -98,11 +98,11 @@ replace: userPrincipalName userPrincipalName: nettest@$REALM EOF -testit "modify servicePrincipalName and userPrincpalName" $VALGRIND $ldbmodify -H ldap://$SERVER $PREFIX/tmpldbmodify -k yes $@ || failed=$(expr $failed + 1) +testit "modify servicePrincipalName and userPrincpalName" $VALGRIND $ldbmodify -H ldap://$SERVER $PREFIX/tmpldbmodify -k yes "$@" || failed=$(expr $failed + 1) -testit "set user password with kerberos ccache" $VALGRIND $PYTHON $samba_tool user setpassword nettestuser --newpassword=$USERPASS $CONFIGURATION -k yes $@ || failed=$(expr $failed + 1) +testit "set user password with kerberos ccache" $VALGRIND $PYTHON $samba_tool user setpassword nettestuser --newpassword=$USERPASS $CONFIGURATION -k yes "$@" || failed=$(expr $failed + 1) -testit "enable user with kerberos cache" $VALGRIND $PYTHON $enableaccount nettestuser -H ldap://$SERVER -k yes $@ || failed=$(expr $failed + 1) +testit "enable user with kerberos cache" $VALGRIND $PYTHON $enableaccount nettestuser -H ldap://$SERVER -k yes "$@" || failed=$(expr $failed + 1) KRB5CCNAME_PATH="$PREFIX/tmpuserccache" KRB5CCNAME="FILE:$KRB5CCNAME_PATH" @@ -115,7 +115,7 @@ testit "kinit with user password (after enable of user and password change)" $sa test_smbclient "Test login with user kerberos ccache" 'ls' "$unc" --use-krb5-ccache=$KRB5CCNAME || failed=$(expr $failed + 1) NEWUSERPASS=testPaSS@34% -testit "change user password with 'samba-tool user password' (rpc)" $VALGRIND $PYTHON $samba_tool user password -W$DOMAIN -Unettestuser%$USERPASS $CONFIGURATION -k no --newpassword=$NEWUSERPASS $@ || failed=$(expr $failed + 1) +testit "change user password with 'samba-tool user password' (rpc)" $VALGRIND $PYTHON $samba_tool user password -W$DOMAIN -Unettestuser%$USERPASS $CONFIGURATION -k no --newpassword=$NEWUSERPASS "$@" || failed=$(expr $failed + 1) echo $NEWUSERPASS >$PREFIX/tmpuserpassfile rm -f $KRB5CCNAME_PATH @@ -142,7 +142,7 @@ replace: userPrincipalName userPrincipalName: nettest@$REALM.org EOF -testit "modify userPrincipalName to be a different domain" $VALGRIND $ldbmodify $ADMIN_LDBMODIFY_CONFIG $PREFIX/tmpldbmodify $PREFIX/tmpldbmodify -k yes $@ || failed=$(expr $failed + 1) +testit "modify userPrincipalName to be a different domain" $VALGRIND $ldbmodify $ADMIN_LDBMODIFY_CONFIG $PREFIX/tmpldbmodify $PREFIX/tmpldbmodify -k yes "$@" || failed=$(expr $failed + 1) rm -f $KRB5CCNAME_PATH testit "kinit with password (enterprise style) using UPN" $samba4kinit $enctype --enterprise --password-file=$PREFIX/tmpuserpassfile --request-pac nettest@$REALM.org || failed=$(expr $failed + 1) @@ -214,7 +214,7 @@ EOF USERPASS=$NEWUSERPASS NEWUSERPASS=testPaSS@911% -testit "modify pwdLastSet" $VALGRIND $ldbmodify $ADMIN_LDBMODIFY_CONFIG $PREFIX/tmpldbmodify $PREFIX/tmpldbmodify -k yes $@ || failed=$(expr $failed + 1) +testit "modify pwdLastSet" $VALGRIND $ldbmodify $ADMIN_LDBMODIFY_CONFIG $PREFIX/tmpldbmodify $PREFIX/tmpldbmodify -k yes "$@" || failed=$(expr $failed + 1) cat >$PREFIX/tmppasswordchange <