* Makefile.in (site.exp): Write KRB5_DB_MODULE_DIR setting into site.exp.

Depend on Makefile.
* config/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.

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

diff --git a/src/tests/dejagnu/ChangeLog b/src/tests/dejagnu/ChangeLog
index 560919156f2b23a426167e38ab33be8f3057cd55..8ab80f33233b6ac563c4285001fab93bd4c234c3 100644 (file)
--- a/src/tests/dejagnu/ChangeLog
+++ b/src/tests/dejagnu/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-16  Ken Raeburn  <raeburn@mit.edu>
+
+       * Makefile.in (site.exp): Write KRB5_DB_MODULE_DIR setting into
+       site.exp.  Depend on Makefile.
+
 2004-02-12  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in (check-runtest-yes): Add PRIOCNTL_HACK.

diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in
index 9b336450821d42bd8ff3036319c6f725d2abc5de..28a820134d192a18e087f0c85804d521e2ba878e 100644 (file)
--- a/src/tests/dejagnu/Makefile.in
+++ b/src/tests/dejagnu/Makefile.in
@@ -41,9 +41,10 @@ runenv.vals: runenv.vars
        $(KRB5_RUN_ENV) for i in `cat runenv.vars`; do \
                eval echo "{$$i=\$$$$i}"; done > runenv.vals
 
-site.exp: runenv.vals
+site.exp: runenv.vals Makefile
        echo "set runvarlist [list `cat runenv.vals | tr '\n' ' '`]" | \
                sed -e 's%=\.%='`pwd`'/.%g' > site.exp
+       echo "set KRB5_DB_MODULE_DIR {$(KRB5_DB_MODULE_DIR)}" >> site.exp
 
 # +++ Dependency line eater +++
 # 

diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog
index 030793fb9467ed66c1b21a7315449f20d76f2388..a37583d2581264bc072a1ff9d25b4c2a5093501c 100644 (file)
--- a/src/tests/dejagnu/config/ChangeLog
+++ b/src/tests/dejagnu/config/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-16  Ken Raeburn  <raeburn@mit.edu>
+
+       * 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.
+
 2005-03-14  Ken Raeburn  <raeburn@mit.edu>
 
        * default.exp (start_tail): Make 'standalone' an additional

diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index 5a37b9d229a2972e9320557ea876b14b6064a4f0..261d3706b5cfd2596aaf4a710e00a2b3f374c3f2 100644 (file)
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -809,7 +809,7 @@ proc setup_kerberos_files { } {
        puts $conffile ""
        puts $conffile "\[realms\]"
        puts $conffile "        $REALMNAME = \{"
-       puts $conffile "                database_name = $tmppwd/db"
+#      puts $conffile "                database_name = $tmppwd/db"
        puts $conffile "                admin_database_name = $tmppwd/adb"
        puts $conffile "                admin_database_lockfile = $tmppwd/adb.lock"
        puts $conffile "                key_stash_file = $tmppwd/stash"
@@ -883,6 +883,7 @@ proc setup_krb5_conf { {type client} } {
     global permitted_enctypes
     global mode
     global portbase
+    global KRB5_DB_MODULE_DIR
 
     # Create a krb5.conf file.
     if { ![file exists $tmppwd/krb5.$type.conf] \
@@ -919,6 +920,9 @@ 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 "        \}"
        puts $conffile ""
        puts $conffile "\[domain_realm\]"
@@ -929,6 +933,15 @@ proc setup_krb5_conf { {type client} } {
        puts $conffile "        admin_server = FILE:$tmppwd/kadmind5.log"
        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 "    }"
+       }
        close $conffile
     }
 }