diff options
| -rw-r--r-- | selftest/knownfail.d/keytab | 1 | ||||
| -rwxr-xr-x | testprogs/blackbox/test_export_keytab_heimdal.sh | 15 |
2 files changed, 11 insertions, 5 deletions
diff --git a/selftest/knownfail.d/keytab b/selftest/knownfail.d/keytab index c835fb39eae..e69de29bb2d 100644 --- a/selftest/knownfail.d/keytab +++ b/selftest/knownfail.d/keytab @@ -1 +0,0 @@ -^samba4.blackbox.export.keytab.*.kinit with SPN from keytab
\ No newline at end of file diff --git a/testprogs/blackbox/test_export_keytab_heimdal.sh b/testprogs/blackbox/test_export_keytab_heimdal.sh index 608d78a0dd5..529961ea894 100755 --- a/testprogs/blackbox/test_export_keytab_heimdal.sh +++ b/testprogs/blackbox/test_export_keytab_heimdal.sh @@ -24,7 +24,8 @@ samba_tool="$samba4bindir/samba-tool" samba4ktutil="$BINDIR/samba4ktutil" newuser="$samba_tool user create" -SERVER_FQDN="$SERVER.$(echo $REALM | tr '[:upper:]' '[:lower:]')" +DNSDOMAIN=$(echo $REALM | tr '[:upper:]' '[:lower:]') +SERVER_FQDN="$SERVER.$DNSDOMAIN" samba4kinit=kinit if test -x $BINDIR/samba4kinit; then @@ -77,6 +78,9 @@ test_keytab "dump keytab from domain for user principal" "$PREFIX/tmpkeytab-2" " 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` test_keytab "dump keytab from domain for user principal (2nd time)" "$PREFIX/tmpkeytab-2" "nettestuser@$REALM" 5 +testit "dump keytab from domain for user principal with SPN as UPN" $VALGRIND $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" 5 + KRB5CCNAME="$PREFIX/tmpuserccache" export KRB5CCNAME @@ -93,11 +97,14 @@ export KRB5CCNAME testit "kinit with keytab as $USERNAME" $VALGRIND $samba4kinit --keytab=$PREFIX/tmpkeytab --request-pac $USERNAME@$REALM || failed=`expr $failed + 1` -KRB5CCNAME="$PREFIX/tmpserverccache" +KRB5CCNAME="$PREFIX/tmpspnupnccache" +export KRB5CCNAME +testit "kinit with SPN from keytab" $VALGRIND $samba4kinit -k -t $PREFIX/tmpkeytab-3 http/testupnspn.$DNSDOMAIN || failed=`expr $failed + 1` + +KRB5CCNAME="$PREFIX/tmpadminccache" export KRB5CCNAME -testit "kinit with SPN from keytab" $VALGRIND $samba4kinit -k -t $PREFIX/tmpkeytab-server cifs/$SERVER_FQDN || failed=`expr $failed + 1` testit "del user" $VALGRIND $samba_tool user delete nettestuser -k yes $@ || failed=`expr $failed + 1` -rm -f $PREFIX/tmpadminccache $PREFIX/tmpuserccache $PREFIX/tmpkeytab $PREFIX/tmpkeytab-2 $PREFIX/tmpkeytab-server +rm -f $PREFIX/tmpadminccache $PREFIX/tmpuserccache $PREFIX/tmpkeytab $PREFIX/tmpkeytab-2 $PREFIX/tmpkeytab-2 $PREFIX/tmpkeytab-server $PREFIX/tmpspnupnccache exit $failed |