selftest: Align cleanup of tmpkpasswdscript with scripts that use it

Some scripts removed it without creating it and the others created it
and did not remove it.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

diff --git a/testprogs/blackbox/test_chgdcpass.sh b/testprogs/blackbox/test_chgdcpass.sh
index 3830cb4e31d0a8f4d16e80eb177cd3d9c7e15dd1..6ac4c882e32e54b4964a45e883d026072ef530e5 100755 (executable)
--- a/testprogs/blackbox/test_chgdcpass.sh
+++ b/testprogs/blackbox/test_chgdcpass.sh
@@ -110,5 +110,5 @@ test_smbclient "Test login with kerberos ccache with fresh kinit" 'ls' "$unc" -k
 
 rm -f $KRB5CCNAME
 
-rm -f $PREFIX/tmpccache tmpccfile tmppassfile tmpuserpassfile tmpuserccache tmpkpasswdscript
+rm -f $PREFIX/tmpccache tmpccfile tmppassfile tmpuserpassfile tmpuserccache
 exit $failed

diff --git a/testprogs/blackbox/test_kinit_mit.sh b/testprogs/blackbox/test_kinit_mit.sh
index 3e07281b8c7003a5ec7f897a43e4ffcbab11eb0d..d178ba4c7106ac30411b0c2604307d1935150093 100755 (executable)
--- a/testprogs/blackbox/test_kinit_mit.sh
+++ b/testprogs/blackbox/test_kinit_mit.sh
@@ -306,5 +306,5 @@ $samba_kdestroy
 rm -f $KRB5CCNAME_PATH
 rm -f $PREFIX/tmpkinituserpassscript
 rm -f $PREFIX/tmpkinitscript
-
+rm -f $PREFIX/tmpkpasswdscript
 exit $failed

diff --git a/testprogs/blackbox/test_kinit_trusts_heimdal.sh b/testprogs/blackbox/test_kinit_trusts_heimdal.sh
index e67f77361a4172bd8323fce0b0fd1bd7ae9f38eb..4a1c0f7f213f316fe73854bbe05b4f478ab5ce14 100755 (executable)
--- a/testprogs/blackbox/test_kinit_trusts_heimdal.sh
+++ b/testprogs/blackbox/test_kinit_trusts_heimdal.sh
@@ -94,5 +94,5 @@ testit "wbinfo check outgoing trust pw" $VALGRIND $wbinfo --check-secret --domai
 
 test_smbclient "Test user login with the changed outgoing secret" 'ls' "$unc" -k yes -U$USERNAME@$REALM%$PASSWORD || failed=`expr $failed + 1`
 
-rm -f $PREFIX/tmpccache tmpccfile tmppassfile tmpuserpassfile tmpuserccache tmpkpasswdscript
+rm -f $PREFIX/tmpccache tmpccfile tmppassfile tmpuserpassfile tmpuserccache
 exit $failed