Fix to last change: Add the new db info lines to krb5.conf files always, not

just kdc file, so kadmin.local (etc) invocations using other config files still
see them.

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

diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog
index a37583d2581264bc072a1ff9d25b4c2a5093501c..3814a7b775775a19800ce418249a56bdd527de3c 100644 (file)
--- a/src/tests/dejagnu/config/ChangeLog
+++ b/src/tests/dejagnu/config/ChangeLog
@@ -3,7 +3,7 @@
        * default.exp (setup_kerberos_files): Don't write database_name
        entry into KDC config file.
        (setup_krb5_conf): Write new config lines for the realm into the
-       krb5.conf file for the KDC.
+       krb5.conf files.
 
 2005-03-14  Ken Raeburn  <raeburn@mit.edu>
 

diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index 261d3706b5cfd2596aaf4a710e00a2b3f374c3f2..8f078c300569f626ec5e08559aeee409cbbc39da 100644 (file)
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -920,9 +920,7 @@ proc setup_krb5_conf { {type client} } {
        puts $conffile "                kpasswd_server = $hostname:[expr 5 + $portbase]"
        puts $conffile "                default_domain = $domain"
        puts $conffile "                krb524_server = $hostname:[expr 7 + $portbase]"
-       if { $type == "kdc" } {
-           puts $conffile "            database_module = foo_db2"
-       }
+       puts $conffile "                database_module = foo_db2"
        puts $conffile "        \}"
        puts $conffile ""
        puts $conffile "\[domain_realm\]"
@@ -934,14 +932,12 @@ proc setup_krb5_conf { {type client} } {
        puts $conffile "        kdc = FILE:$tmppwd/kdc.log"
        puts $conffile "        default = FILE:$tmppwd/others.log"
        puts $conffile ""
-       if { $type == "kdc" } {
-           puts $conffile "\[db_modules\]"
-           puts $conffile "    db_module_dir = $tmppwd/../../../util/fakedest$KRB5_DB_MODULE_DIR"
-           puts $conffile "    foo_db2 = {"
-           puts $conffile "            db_library = db2"
-           puts $conffile "            database_name = $tmppwd/db"
-           puts $conffile "    }"
-       }
+       puts $conffile "\[db_modules\]"
+       puts $conffile "        db_module_dir = $tmppwd/../../../util/fakedest$KRB5_DB_MODULE_DIR"
+       puts $conffile "        foo_db2 = {"
+       puts $conffile "                db_library = db2"
+       puts $conffile "                database_name = $tmppwd/db"
+       puts $conffile "        }"
        close $conffile
     }
 }