Always pass -W to kdb5_util create in testing

(cherry picked from commit ccc2543ecf06b31cdd29907b0c5dd00641b12b65)

ticket: 7182 (new)
version_fixed: 1.8.7
status: resolved

diff --git a/src/kadmin/testing/scripts/init_db b/src/kadmin/testing/scripts/init_db
index d5930223da3714ead0a8f8140325763dd1eedb6c..2ff8208188629c1c306b3b7b296c89040072071a 100755 (executable)
--- 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 87098c66fdf47c03af44c2c7d78872da853325b2..fbe5d63da671829b01e2f86a3f734ad70f0ff572 100644 (file)
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -35,7 +35,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
@@ -45,7 +45,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 d8390e7902c62115b9bc52950bd5b78fc2f118ef..684cc577fdd61aa77b4a582681a287594b2c8b09 100644 (file)
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -1530,7 +1530,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 faf55c1ea9573d9431b342948adb89b2f0f55b7c..1785e108f2e9c349ab8762e7dadfa4a7f6d28970 100644 (file)
--- 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