diff options
| author | Barry Jaspan <bjaspan@mit.edu> | 1996-10-15 20:25:23 +0000 |
|---|---|---|
| committer | Barry Jaspan <bjaspan@mit.edu> | 1996-10-15 20:25:23 +0000 |
| commit | 049abba66ae2a609b3e0f98ab0093d630b5696e5 (patch) | |
| tree | 826c7e811c2e0fc107378ce880d9e042749b50fe /src/kadmin | |
| parent | 65921a980bad3309c8da3f2646c9113d7c83e05d (diff) | |
| download | krb5-049abba66ae2a609b3e0f98ab0093d630b5696e5.tar.gz krb5-049abba66ae2a609b3e0f98ab0093d630b5696e5.tar.xz krb5-049abba66ae2a609b3e0f98ab0093d630b5696e5.zip | |
* krb5.conf.proto: s/localhost/__LOCALHOST__/
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9175 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin')
| -rw-r--r-- | src/kadmin/testing/scripts/ChangeLog | 7 | ||||
| -rw-r--r-- | src/kadmin/testing/scripts/env-setup.shin | 2 | ||||
| -rw-r--r-- | src/kadmin/testing/scripts/init_db | 5 | ||||
| -rw-r--r-- | src/kadmin/testing/scripts/start_servers | 2 |
4 files changed, 14 insertions, 2 deletions
diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog index a0f7038cf3..43b627eb6d 100644 --- a/src/kadmin/testing/scripts/ChangeLog +++ b/src/kadmin/testing/scripts/ChangeLog @@ -1,3 +1,10 @@ +Tue Oct 15 16:22:52 1996 Barry Jaspan <bjaspan@mit.edu> + + * env-setup.shin: set $QUALNAME to the right path + + * start_servers, init_db: use qualname of local host, not + localhost, in krb5.conf + Tue Oct 15 06:39:58 1996 Ezra Peisach <epeisach@kangaroo.mit.edu> * Makefile.in: Added standard rules for .plin -> .pl diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin index 07f8038a06..83bb522e3b 100644 --- a/src/kadmin/testing/scripts/env-setup.shin +++ b/src/kadmin/testing/scripts/env-setup.shin @@ -37,11 +37,11 @@ export LOCAL_MAKE_KEYTAB RESTORE_FILES=$TESTDIR/scripts/restore_files.sh; export RESTORE_FILES SAVE_FILES=$STESTDIR/scripts/save_files.sh; export SAVE_FILES SIMPLE_DUMP=$TESTDIR/scripts/simple_dump.pl; export SIMPLE_DUMP +QUALNAME=$TESTDIR/scripts/qualname.pl; export QUALNAME TCLUTIL=$STESTDIR/tcl/util.t; export TCLUTIL BSDDB_DUMP=$TESTDIR/util/bsddb_dump; export BSDDB_DUMP CLNTTCL=$TESTDIR/util/ovsec_kadm_clnt_tcl; export CLNTTCL SRVTCL=$TESTDIR/util/ovsec_kadm_srv_tcl; export SRVTCL -QUALNAME=$TOP/inst-scripts/qualname.pl; export QUALNAME KRB5_CONFIG=$K5ROOT/krb5.conf; export KRB5_CONFIG KRB5_KDC_PROFILE=$K5ROOT/kdc.conf; export KRB5_KDC_PROFILE diff --git a/src/kadmin/testing/scripts/init_db b/src/kadmin/testing/scripts/init_db index c44a9760a0..98468b9995 100644 --- a/src/kadmin/testing/scripts/init_db +++ b/src/kadmin/testing/scripts/init_db @@ -56,8 +56,11 @@ fi # esac # done +qualname=`$QUALNAME` + sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \ - -e "s/__KDCHOST__/localhost/g" \ + -e "s/__KDCHOST__/$qualname/g" \ + -e "s/__LOCALHOST__/$qualname/g" \ < $STESTDIR/proto/krb5.conf.proto > $K5ROOT/krb5.conf sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \ < $STESTDIR/proto/kdc.conf.proto > $K5ROOT/kdc.conf diff --git a/src/kadmin/testing/scripts/start_servers b/src/kadmin/testing/scripts/start_servers index 26fef9150e..570acea13b 100644 --- a/src/kadmin/testing/scripts/start_servers +++ b/src/kadmin/testing/scripts/start_servers @@ -42,8 +42,10 @@ fi if [ $local = 0 ]; then # Fix up the local krb5.conf to point to the remote + localname=`$QUALNAME` sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \ -e "s/__KDCHOST__/$hostname/g" \ + -e "s/__LOCALHOST__/$localname/g" \ < $STESTDIR/proto/krb5.conf.proto > $K5ROOT/krb5.conf # Using /usr/ucb/rsh and getting rid of "-k $REALM" until we get |