summaryrefslogtreecommitdiffstats
path: root/src/kadmin/testing
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2003-05-14 00:26:17 +0000
committerKen Raeburn <raeburn@mit.edu>2003-05-14 00:26:17 +0000
commitfdebdb4383715d875f3659498f2671f964b1c149 (patch)
treec7e91481cc1446ae180486bb9eb86a5f5b384c81 /src/kadmin/testing
parent1b6fe443a3d98f6f91609d654b7516641be3f605 (diff)
downloadkrb5-fdebdb4383715d875f3659498f2671f964b1c149.tar.gz
krb5-fdebdb4383715d875f3659498f2671f964b1c149.tar.xz
krb5-fdebdb4383715d875f3659498f2671f964b1c149.zip
* 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
Diffstat (limited to 'src/kadmin/testing')
-rw-r--r--src/kadmin/testing/scripts/ChangeLog6
-rw-r--r--src/kadmin/testing/scripts/start_servers_local1
-rw-r--r--src/kadmin/testing/scripts/stop_servers_local6
3 files changed, 12 insertions, 1 deletions
diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index 4a4031e57e..3132c9889d 100644
--- 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 707888d319..71698caa57 100644
--- 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 75ae7f1118..15700f5011 100644
--- 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