summaryrefslogtreecommitdiffstats
path: root/src/kadmin/testing/scripts/env-setup.shin
diff options
context:
space:
mode:
authorBarry Jaspan <bjaspan@mit.edu>1996-09-26 21:49:35 +0000
committerBarry Jaspan <bjaspan@mit.edu>1996-09-26 21:49:35 +0000
commit512ffeff727885e6d612c3a163f0ad27732d8077 (patch)
tree9b0d33dc1c1cbc441f657ce4f31f3aa9310b4ecb /src/kadmin/testing/scripts/env-setup.shin
parent192e0abb1cc96b2c1935925a2192ac14f8a4389c (diff)
downloadkrb5-512ffeff727885e6d612c3a163f0ad27732d8077.tar.gz
krb5-512ffeff727885e6d612c3a163f0ad27732d8077.tar.xz
krb5-512ffeff727885e6d612c3a163f0ad27732d8077.zip
* env-setup.sh, init_db, start_servers_local: use K5ROOT instead
of /krb5 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9122 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/testing/scripts/env-setup.shin')
-rw-r--r--src/kadmin/testing/scripts/env-setup.shin11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin
index dd6837b74..461104d5d 100644
--- a/src/kadmin/testing/scripts/env-setup.shin
+++ b/src/kadmin/testing/scripts/env-setup.shin
@@ -16,6 +16,11 @@ if [ "$TOP" = "" ]; then
exit 1
fi
+if [ "$K5ROOT" = "" ]; then
+ # XXX this should default to --prefix, no?
+ K5ROOT="/krb5"; export K5ROOT
+fi
+
TESTDIR=$TOP/testing; export TESTDIR
COMPARE_DUMP=$TESTDIR/scripts/compare_dump.pl; export COMPARE_DUMP
FIX_CONF_FILES=$TESTDIR/scripts/fixup-conf-files.pl
@@ -43,9 +48,9 @@ export STOP_SERVERS
STOP_SERVERS_LOCAL=$TESTDIR/scripts/stop_servers_local
export STOP_SERVERS_LOCAL
-KRB5_CONFIG=/krb5/krb5.conf; export KRB5_CONFIG
-KRB5_KDC_PROFILE=/krb5/kdc.conf; export KRB5_KDC_PROFILE
-KRB5_KTNAME=/krb5/ovsec_adm.srvtab; export KRB5_KTNAME
+KRB5_CONFIG=$K5ROOT/krb5.conf; export KRB5_CONFIG
+KRB5_KDC_PROFILE=$K5ROOT/kdc.conf; export KRB5_KDC_PROFILE
+KRB5_KTNAME=$K5ROOT/ovsec_adm.srvtab; export KRB5_KTNAME
if [ "$TEST_SERVER" != "" ]; then
MAKE_KEYTAB="$MAKE_KEYTAB -server $TEST_SERVER"