From 4f89fba550e6789ae1d5c89c626f47d6571aa220 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Mar 12 2004 20:10:10 +0000
Subject: * tests/run-tests: use expect when invoking kdb5_util to create databases.

* tests/config/kdc.conf.in: set admin_keytab per-realm as well.

---

diff --git a/ChangeLog b/ChangeLog
index 25c425f..766b976 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-12 nalin
+	* tests/run-tests: use expect when invoking kdb5_util to create
+	databases.
+	* tests/config/kdc.conf.in: set admin_keytab per-realm as well.
+
 2004-03-11 nalin
 	* pam_krb5.spec: bump to version 1.71
 
diff --git a/tests/config/kdc.conf.in b/tests/config/kdc.conf.in
index 257adcd..5e00641 100644
--- a/tests/config/kdc.conf.in
+++ b/tests/config/kdc.conf.in
@@ -9,6 +9,7 @@
  EXAMPLE.COM = {
   database_name = @TESTDIR@/kdc/principal
   key_stash_file = @TESTDIR@/kdc/stash_file
+  admin_keytab = @TESTDIR@/kdc/kadm5.keytab
   master_key_type = des-cbc-crc
   supported_enctypes = des3-cbc-sha1:normal des-cbc-crc:normal
   kadmind_port = 8801
diff --git a/tests/run-tests b/tests/run-tests
index 3bb7751..7d7d30c 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -44,11 +44,19 @@ kdcstart() {
 	fi
 
 	test -d $testdir/kdc || mkdir -p $testdir/kdc
-	(echo .; echo .) | kdb5_util create -s 2> /dev/null > /dev/null
-
+	expect > /dev/null 2> /dev/null << EOF
+	spawn kdb5_util create -s
+	expect "master key"
+	sleep 1
+	send "\n"
+	send "\n"
+	sleep 1
+EOF
 	kadmin.local -q 'ank -pw foo '$principal 2> /dev/null > /dev/null
 	kadmin.local -q 'modprinc -maxrenewlife "1 day" krbtgt/EXAMPLE.COM' 2> /dev/null > /dev/null
 	kadmin.local -q 'modprinc -maxrenewlife "1 day" '$principal 2> /dev/null > /dev/null
+	kadmin.local -q "ktadd -k $testdir/kdc/kadm5.keytab kadmin/admin" 2> /dev/null > /dev/null
+	kadmin.local -q "ktadd -k $testdir/kdc/kadm5.keytab kadmin/changepw" 2> /dev/null > /dev/null
 	rm -f $testdir/kdc/krb5kdc.log
 	rm -f $testdir/kdc/kadmind.log
 	rm -f $testdir/kdc/krb5libs.log