From af7613fa2562a80688b461cbbdc95dd14bb4ddb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Mon, 25 Aug 2014 16:35:23 +0200 Subject: [PATCH] testprogs: allow to run passwords test with MIT and Heimdal kinit. Guenther Signed-off-by: Guenther Deschner Reviewed-by: Andreas Schneider Reviewed-by: Andrew Bartlet --- testprogs/blackbox/test_passwords.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/testprogs/blackbox/test_passwords.sh b/testprogs/blackbox/test_passwords.sh index 4810177d1276..00a88b3a9430 100755 --- a/testprogs/blackbox/test_passwords.sh +++ b/testprogs/blackbox/test_passwords.sh @@ -54,6 +54,18 @@ test_smbclient() { return $status } +do_kinit() { + file="$1" + password="$2" + shift + shift + if test -x $BINDIR/samba4kinit; then + $samba4kinit --password-file=$file --request-pac $@ + else + echo $password | $samba4kinit $@ + fi +} + UID_WRAPPER_ROOT=1 export UID_WRAPPER_ROOT @@ -71,7 +83,7 @@ export KRB5CCNAME echo $USERPASS > $PREFIX/tmpuserpassfile -testit "kinit with user password" $samba4kinit --password-file=$PREFIX/tmpuserpassfile --request-pac nettestuser@$REALM || failed=`expr $failed + 1` +testit "kinit with user password" do_kinit $PREFIX/tmpuserpassfile $USERPASS nettestuser@$REALM || failed=`expr $failed + 1` test_smbclient "Test login with user kerberos ccache" 'ls' -k yes || failed=`expr $failed + 1` @@ -79,7 +91,7 @@ NEWUSERPASS=testPaSS@01% testit "change user password with 'samba-tool user password' (unforced)" $VALGRIND $samba_tool user password -W$DOMAIN -U$DOMAIN/nettestuser%$USERPASS -k no --newpassword=$NEWUSERPASS $@ || failed=`expr $failed + 1` echo $NEWUSERPASS > ./tmpuserpassfile -testit "kinit with user password" $samba4kinit --password-file=./tmpuserpassfile --request-pac nettestuser@$REALM || failed=`expr $failed + 1` +testit "kinit with user password" do_kinit ./tmpuserpassfile $NEWUSERPASS nettestuser@$REALM || failed=`expr $failed + 1` test_smbclient "Test login with user kerberos ccache" 'ls' -k yes || failed=`expr $failed + 1`