From 5927e46000a0ca0f6405bdba5fd89e566c96c8fa Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Fri, 22 Apr 2016 16:38:01 +0200 Subject: [PATCH] selftest/samba4.blackbox.export.keytab: use spn based on fqdn Signed-off-by: Ralph Boehme Reviewed-by: Andreas Schneider --- testprogs/blackbox/test_export_keytab_heimdal.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testprogs/blackbox/test_export_keytab_heimdal.sh b/testprogs/blackbox/test_export_keytab_heimdal.sh index 736c7af099f..3bfd61ca62e 100755 --- a/testprogs/blackbox/test_export_keytab_heimdal.sh +++ b/testprogs/blackbox/test_export_keytab_heimdal.sh @@ -23,6 +23,8 @@ samba4bindir="$BINDIR" samba_tool="$samba4bindir/samba-tool" newuser="$samba_tool user create" +SERVER_FQDN="$SERVER.$(echo $REALM | tr '[:upper:]' '[:lower:]')" + samba4kinit=kinit if test -x $BINDIR/samba4kinit; then samba4kinit=$BINDIR/samba4kinit @@ -53,8 +55,8 @@ testit "create user locally" $VALGRIND $newuser nettestuser $USERPASS $@ || fail testit "dump keytab from domain" $VALGRIND $samba_tool domain exportkeytab $PREFIX/tmpkeytab $@ || failed=`expr $failed + 1` testit "dump keytab from domain (2nd time)" $VALGRIND $samba_tool domain exportkeytab $PREFIX/tmpkeytab $@ || failed=`expr $failed + 1` -testit "dump keytab from domain for cifs principal" $VALGRIND $samba_tool domain exportkeytab $PREFIX/tmpkeytab-server --principal=cifs/$SERVER $@ || failed=`expr $failed + 1` -testit "dump keytab from domain for cifs principal (2nd time)" $VALGRIND $samba_tool domain exportkeytab $PREFIX/tmpkeytab-server --principal=cifs/$SERVER $@ || failed=`expr $failed + 1` +testit "dump keytab from domain for cifs principal" $VALGRIND $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 $samba_tool domain exportkeytab $PREFIX/tmpkeytab-server --principal=cifs/$SERVER_FQDN $@ || failed=`expr $failed + 1` testit "dump keytab from domain for user principal" $VALGRIND $samba_tool domain exportkeytab $PREFIX/tmpkeytab-2 --principal=nettestuser $@ || failed=`expr $failed + 1` testit "dump keytab from domain for user principal (2nd time)" $VALGRIND $samba_tool domain exportkeytab $PREFIX/tmpkeytab-2 --principal=nettestuser@$REALM $@ || failed=`expr $failed + 1`