[2019] in Kerberos_V5_Development
Fix for the dejagnu screwup
daemon@ATHENA.MIT.EDU (epeisach@MIT.EDU)
Mon Nov 25 14:00:48 1996
From: epeisach@MIT.EDU
Date: Mon, 25 Nov 1996 14:00:39 -0500
To: krbdev@MIT.EDU
Here is the fix...
Index: default.exp
===================================================================
RCS file: /mit/krb5/.cvsroot/src/tests/dejagnu/config/default.exp,v
retrieving revision 1.42.2.1
diff -c -r1.42.2.1 default.exp
*** default.exp 1996/11/19 22:16:13 1.42.2.1
--- default.exp 1996/11/25 18:42:42
***************
*** 761,766 ****
--- 761,767 ----
global kadmind_pid
global kadmind_spawn_id
global tmppwd
+ global env
if ![setup_kerberos_db 0] {
return 0
***************
*** 819,824 ****
--- 820,836 ----
# Give the kerberos daemon a few seconds to get set up.
sleep 2
+
+ #
+ # Save setting of KRB5_KTNAME. We do not want to override kdc.conf
+ # file during kadmind startup. (this is in case user has KRB5_KTNAME
+ # set before starting make check)
+ #
+ if [info exists env(KRB5_KTNAME)] {
+ set start_save_ktname $env(KRB5_KTNAME)
+ }
+ catch "unset env(KRB5_KTNAME)"
+
if ![file exists $kadmind_lfile] then {
catch [touch $kadmind_lfile]
sleep 1
***************
*** 842,849 ****
--- 854,871 ----
if {$count >= $retry} {
fail "kadmin5 (starting)"
+ if [info exists start_save_ktname] {
+ set env(KRB5_KTNAME) $start_save_ktname
+ unset start_save_ktname
+ }
stop_kerberos_daemons
return 0
+ }
+
+ # Restore KRB5_KTNAME
+ if [info exists start_save_ktname] {
+ set env(KRB5_KTNAME) $start_save_ktname
+ unset start_save_ktname
}
switch -regexp [tail1 $kadmind_lfile] {
