* start_servers_local: Set KRB5RCACHEDIR.

* stop_servers_local: Set KRB5RCACHEDIR.  Use the correct filename when
deleting the replay cache file.

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

diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index 4a4031e57e7ce51ae80d6094487f0f19a9aac840..3132c9889df3596ed5a1c16e026b27742b02a3c2 100644 (file)
--- a/src/kadmin/testing/scripts/ChangeLog
+++ b/src/kadmin/testing/scripts/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-13  Ken Raeburn  <raeburn@mit.edu>
+
+       * start_servers_local: Set KRB5RCACHEDIR.
+       * stop_servers_local: Set KRB5RCACHEDIR.  Use the correct filename
+       when deleting the replay cache file.
+
 2003-01-07  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.ov: Deleted.

diff --git a/src/kadmin/testing/scripts/start_servers_local b/src/kadmin/testing/scripts/start_servers_local
index 707888d3197d28b78243c52ab3d34c45a551e4ea..71698caa575bab526086400f7e6bf7a71244eaa7 100644 (file)
--- a/src/kadmin/testing/scripts/start_servers_local
+++ b/src/kadmin/testing/scripts/start_servers_local
@@ -8,6 +8,7 @@ DUMMY=${INITDB=$STESTDIR/scripts/init_db}
 DUMMY=${SRVTCL=$TESTDIR/util/ovsec_kadm_srv_tcl}; export SRVTCL
 DUMMY=${LOCAL_MAKE_KEYTAB=$TESTDIR/scripts/make-host-keytab.pl}
 DUMMY=${STOP_SERVERS_LOCAL=$STESTDIR/scripts/stop_servers_local}
+DUMMY=${KRB5RCACHEDIR=$TESTDIR} ; export KRB5RCACHEDIR
 
 if [ -d /usr/tmp ]; then
        usrtmp=/usr/tmp

diff --git a/src/kadmin/testing/scripts/stop_servers_local b/src/kadmin/testing/scripts/stop_servers_local
index 75ae7f1118dea5cdf75cbd5a3e3f9241be41666f..15700f50117cb7c8a86a3a4f0935737b68118c69 100644 (file)
--- a/src/kadmin/testing/scripts/stop_servers_local
+++ b/src/kadmin/testing/scripts/stop_servers_local
@@ -2,6 +2,7 @@
 
 DUMMY=${TESTDIR=$TOP/testing}
 DUMMY=${RESTORE_FILES=$TESTDIR/scripts/restore_files.sh}
+DUMMY=${KRB5RCACHEDIR=$TESTDIR}
 
 v4files=false
 while [ $# -gt 0 ] ; do
@@ -40,7 +41,10 @@ done
 
 # Destroy the kdc replay cache so we don't lose if we try to run the
 # KDC as another unix user.
-rm -f /usr/tmp/krb5kdc_rcache
+if test "x$USER" = x ; then
+  USER=$LOGNAME
+fi
+rm -f $KRB5RCACHEDIR/krb5kdc_rcache.$USER
 
 # restore saved system config files
 if $v4files; then