From 8babd28673aa389dd469365e3350da0b007417c5 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@dahyabhai.net>
Date: Sep 01 2012 08:00:56 +0000
Subject: go back to fixed port numbers


---

diff --git a/tests/config/kdc.conf.in b/tests/config/kdc.conf.in
index cf19b15..1479318 100644
--- a/tests/config/kdc.conf.in
+++ b/tests/config/kdc.conf.in
@@ -1,7 +1,6 @@
 [kdcdefaults]
- v4_mode = full
- kdc_ports = 8800
- kdc_tcp_ports = 8800
+ kdc_ports = 8801
+ kdc_tcp_ports = 8801
 
 [realms]
  EXAMPLE.COM = {
@@ -12,7 +11,7 @@
   dict_file = /usr/share/dict/words
   database_name = @TESTDIR@/kdc/principal
   key_stash_file = @TESTDIR@/kdc/stash_file
-  supported_enctypes = aes256-cts:normal des3-cbc-sha1:normal des-cbc-crc:normal
-  kadmind_port = 8801
+  supported_enctypes = aes256-cts:normal rc4-hmac:none des3-cbc-sha1:normal des-cbc-crc:normal
   kpasswd_port = 8802
+  kadmind_port = 8803
  }
diff --git a/tests/config/krb5.conf.in b/tests/config/krb5.conf.in
index da26fa3..2ae127b 100644
--- a/tests/config/krb5.conf.in
+++ b/tests/config/krb5.conf.in
@@ -6,12 +6,13 @@
 [libdefaults]
  default_realm = EXAMPLE.COM
  udp_preference_limit = 1
+ dns_lookup_kdc = false
+ dns_lookup_realm = false
 
 [realms]
  EXAMPLE.COM = {
   pkinit_anchors = FILE:@TESTDIR@/kdc/ca.crt
-  kdc = @TESTHOST@:8800
-  admin_server = @TESTHOST@:8801
+  kdc = @TESTHOST@:8801
   kpasswd_server = @TESTHOST@:8802
  }
 
diff --git a/tests/kdc/Makefile.am b/tests/kdc/Makefile.am
index 0787437..640f13f 100644
--- a/tests/kdc/Makefile.am
+++ b/tests/kdc/Makefile.am
@@ -1 +1 @@
-CLEANFILES = krb5kdc.log krb5libs.log kadmind.log stash_file kadmin_* principal* *_rcache *.key *.csr *.crt *.pem *.p12 *.db *.keytab
+CLEANFILES = krb5kdc.log krb5libs.log kadmind.log stash_file kadmin_* principal* ca.* *_rcache *.key *.csr *.crt *.pem *.p12 *.keytab keyring.* klist.* *_*
diff --git a/tests/run-tests.sh b/tests/run-tests.sh
index ad44943..7827929 100755
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -15,9 +15,6 @@ test -n "$kadmind" && echo Using kadmind binary: $kadmind
 test -n "$kadmin"  && echo Using kadmin.local binary: $kadmin
 
 # Run each test with clear log files and a fresh copy of the KDC and kadmind.
-kdcport=`expr $RANDOM % 8800 + 8800`
-kadminport=`expr $kdcport + 1`
-kpasswdport=`expr $kadminport + 1`
 for test in ${@:-"$testdir"/0*} ; do
 	if ! test -s $test/run.sh ; then
 		continue
@@ -25,13 +22,7 @@ for test in ${@:-"$testdir"/0*} ; do
 	echo -n `basename "$test"` ..." "
 	test_kdcinitdb
 	test_kdcprep
-	sed -i -e s/8800/$kdcport/g config/*.conf
-	sed -i -e s/8801/$kadminport/g config/*.conf
-	sed -i -e s/8802/$kpasswdport/g config/*.conf
 	meanwhile "$run_kdc" "$run_kadmind" "$test/run.sh" > $test/stdout 2> $test/stderr
-	sed -i -e s/$kdcport/8800/g config/*.conf
-	sed -i -e s/$kadminport/8801/g config/*.conf
-	sed -i -e s/$kpasswdport/8802/g config/*.conf
 	kdcport=`expr $kdcport + 3`
 	kadminport=`expr $kdcport + 1`
 	kpasswdport=`expr $kadminport + 1`