s3-selftest: Activate "net ads kerberos kinit" tests with --use-krb5-ccache

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15840

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/selftest/knownfail b/selftest/knownfail
index ab2d79d7114edb6ee29eafd4ef5e4ce84921471b..76f1dae605d8d3c852f04965f4c982d4d4e7b5c9 100644 (file)
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -338,3 +338,5 @@
 
 # We currently don't send referrals for LDAP modify of non-replicated attrs
 ^samba4.ldap.rodc.python\(rodc\).__main__.RodcTests.test_modify_nonreplicated.*
+
+^samba3.blackbox.net_ads_kerberos.*.klist.*--use-krb5-ccache.*

diff --git a/source3/script/tests/test_net_ads_kerberos.sh b/source3/script/tests/test_net_ads_kerberos.sh
index c53520cf733d7c60590f4c8d052f1170ecd56c02..b7933bab6a6ee21317ebdc2963b71d8e670ca36a 100755 (executable)
--- a/source3/script/tests/test_net_ads_kerberos.sh
+++ b/source3/script/tests/test_net_ads_kerberos.sh
@@ -53,12 +53,15 @@ testit "klist env $KRB5CCNAME" \
 unset KRB5CCNAME
 rm -f "$KRB5CCNAME_PATH"
 
-# --use-krb5-ccache is not working
-#testit "net_ads_kerberos_kinit (with --use-krb5-ccache)" \
-#      $VALGRIND $BINDIR/net ads kerberos kinit \
-#      -U$USERNAME%$PASSWORD $ADDARGS \
-#      --use-krb5-ccache=${KRB5CCNAME} \
-#      || failed=$((failed + 1))
+testit "net_ads_kerberos_kinit (with --use-krb5-ccache)" \
+       "$VALGRIND" "$BINDIR"/net ads kerberos kinit \
+       -U"$USERNAME"%"$PASSWORD" "$ADDARGS" \
+       --use-krb5-ccache="${KRB5CCNAME_PATH}" \
+       || failed=$((failed + 1))
+testit "klist --use-krb5-ccache $KRB5CCNAME_PATH" \
+       "$KLIST" "$KRB5CCNAME_PATH" \
+       || failed=$((failed +1))
+rm -f "$KRB5CCNAME_PATH"
 
 #simply uses in memory ccache
 testit "net_ads_kerberos_kinit (-P)" \
@@ -77,12 +80,15 @@ testit "klist env $KRB5CCNAME" \
 unset KRB5CCNAME
 rm -f "$KRB5CCNAME_PATH"
 
-# --use-krb5-ccache is not working
-#testit "net_ads_kerberos_kinit (-P with --use-krb5-ccache)" \
-#      $VALGRIND $BINDIR/net ads kerberos kinit \
-#      -P $ADDARGS \
-#      --use-krb5-ccache=${KRB5CCNAME} \
-#      || failed=$((failed + 1))
+testit "net_ads_kerberos_kinit (-P with --use-krb5-ccache)" \
+       "$VALGRIND" "$BINDIR"/net ads kerberos kinit \
+       -P "$ADDARGS" \
+       --use-krb5-ccache="${KRB5CCNAME_PATH}" \
+       || failed=$((failed + 1))
+testit "klist --use-krb5-ccache $KRB5CCNAME_PATH" \
+       "$KLIST" "$KRB5CCNAME_PATH" \
+       || failed=$((failed +1))
+rm -f "$KRB5CCNAME_PATH"
 
 
 #################################################