From ccc2543ecf06b31cdd29907b0c5dd00641b12b65 Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Sat, 27 Mar 2010 21:30:43 +0000
Subject: [PATCH] Always pass -W option to kdb5_util create in testing

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23838 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/kadmin/testing/scripts/init_db     | 2 +-
 src/tests/Makefile.in                  | 4 ++--
 src/tests/dejagnu/config/default.exp   | 2 +-
 src/tests/mkeystash_compat/Makefile.in | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/kadmin/testing/scripts/init_db b/src/kadmin/testing/scripts/init_db
index d5930223d..2ff820818 100755
--- a/src/kadmin/testing/scripts/init_db
+++ b/src/kadmin/testing/scripts/init_db
@@ -87,7 +87,7 @@ sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \
 sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \
 	< $STESTDIR/proto/kdc.conf.proto > $K5ROOT/kdc.conf
 
-eval kdb5_util -r $REALM create -P mrroot -s $REDIRECT || exit 1
+eval kdb5_util -r $REALM create -W -P mrroot -s $REDIRECT || exit 1
 
 cp $STESTDIR/proto/ovsec_adm.dict $K5ROOT/ovsec_adm.dict
 
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index 713dd17b2..66a3db076 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -36,7 +36,7 @@ krb5.conf: Makefile
 
 kdb_check: kdc.conf krb5.conf
 	$(RM) $(TEST_DB)*
-	$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) create
+	$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) create -W
 	$(RUN_SETUP) $(VALGRIND) ../tests/create/kdb5_mkdums $(KTEST_OPTS) 
 	$(RUN_SETUP) $(VALGRIND) ../tests/verify/kdb5_verify $(KTEST_OPTS) 
 	$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) dump $(TEST_DB).dump
@@ -46,7 +46,7 @@ kdb_check: kdc.conf krb5.conf
 	@echo "The following 'create' command is needed due to a change"
 	@echo "in functionality caused by DAL integration.  See ticket 3973."
 	@echo ====
-	$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) create
+	$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) create -W
 	$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) load $(TEST_DB).dump 
 	$(RUN_SETUP) $(VALGRIND) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) load -update -ov $(TEST_DB).ovdump 
 	$(RUN_SETUP) $(VALGRIND) ../tests/verify/kdb5_verify $(KTEST_OPTS) 
diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index cc94718db..382c17409 100644
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -1411,7 +1411,7 @@ proc setup_slave_db { } {
 	}
 	#exec xterm
 	verbose "starting $test"
-	spawn $KDB5_UTIL -r $REALMNAME create
+	spawn $KDB5_UTIL -r $REALMNAME create -W
 	expect_after $def_exp_after
 
 	expect "Enter KDC database master key:"
diff --git a/src/tests/mkeystash_compat/Makefile.in b/src/tests/mkeystash_compat/Makefile.in
index faf55c1ea..1785e108f 100644
--- a/src/tests/mkeystash_compat/Makefile.in
+++ b/src/tests/mkeystash_compat/Makefile.in
@@ -38,7 +38,7 @@ krb5.conf: Makefile
 # Verify that the mkey stash code is backward compat with old/non-keytab stashfile format
 mkeystash_check: kdc.conf krb5.conf bigendian
 	$(RM) $(TEST_DB)* stash_file
-	$(RUN_SETUP) $(VALGRIND) ../../kadmin/dbutil/kdb5_util $(KDB_OPTS) create -s
+	$(RUN_SETUP) $(VALGRIND) ../../kadmin/dbutil/kdb5_util $(KDB_OPTS) create -s -W
 	# overwrite keytab stash file with old format stash, depends on endianness of current test system
 	./bigendian && cp $(srcdir)/old_stash_bendian stash_file || cp $(srcdir)/old_stash_lendian stash_file
 	# getprinc will fail if old stash file can not be read
-- 
2.26.2