This fixes an all-too-frequent nightly-testing failure on Tru64

* default.exp (setup_krb5_conf): Don't include a non-listening KDC port in the
client's config file.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17434 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog
index 82028c7c8e7d34cc96e778b9af387944d33ccd6e..cc348ee325d0f7e0bbd8c6a22ae235d268e33646 100644 (file)
--- a/src/tests/dejagnu/config/ChangeLog
+++ b/src/tests/dejagnu/config/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-19  Ken Raeburn  <raeburn@mit.edu>
+
+       * default.exp (setup_krb5_conf): Don't include a non-listening KDC
+       port in the client's config file.
+
 2005-09-07  Ken Raeburn  <raeburn@mit.edu>
 
        * default.exp: Initialize can_get_root to yes.

diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index c3fd29425e338b32daeb785262eb18205f8025c2..abb7b794ab5d4036b6f53f6bea99190a721f66f8 100644 (file)
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -913,8 +913,14 @@ proc setup_krb5_conf { {type client} } {
        puts $conffile ""
        puts $conffile "\[realms\]"
        puts $conffile "        $REALMNAME = \{"
-       # I hope nothing's listening on 15294...
-       puts $conffile "                kdc = $hostname:[expr 6 + $portbase]"
+       # There's probably nothing listening here.  It would be a good
+       # test for the handling of a non-responsive KDC address.  However,
+       # on some systems, like Tru64, we often wind up with the client's
+       # socket bound to this address, causing our request to appear in
+       # our incoming queue as if it were a response, which causes test
+       # failures.  If we were running the client and KDC on different
+       # hosts, this would be okay....
+       #puts $conffile "               kdc = $hostname:[expr 6 + $portbase]"
        puts $conffile "                kdc = $hostname:[expr 1 + $portbase]"
        puts $conffile "                admin_server = $hostname:[expr 4 + $portbase]"
        puts $conffile "                kpasswd_server = $hostname:[expr 5 + $portbase]"