diff options
Diffstat (limited to 'src/kadmin/testing/scripts/start_servers')
| -rw-r--r-- | src/kadmin/testing/scripts/start_servers | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/kadmin/testing/scripts/start_servers b/src/kadmin/testing/scripts/start_servers index 2e395faf8..dc958d62c 100644 --- a/src/kadmin/testing/scripts/start_servers +++ b/src/kadmin/testing/scripts/start_servers @@ -14,7 +14,7 @@ DUMMY=${SAVE_FILES=$TESTDIR/scripts/save_files.sh} DUMMY=${FIX_CONF_FILES=$TESTDIR/scripts/fixup-conf-files.pl} DUMMY=${START_SERVERS_LOCAL=$TESTDIR/scripts/start_servers_local} # This'll be wrong sometimes -DUMMY=${RSH_CMD=/usr/ucb/rsh} +DUMMY=${RSH_CMD=rsh} # If it's set, set it to true VERBOSE=${VERBOSE_TEST:+true} @@ -39,18 +39,21 @@ if [ $# -gt 0 ]; then fi if [ $local = 0 ]; then - $SAVE_FILES || exit 1 - $FIX_CONF_FILES -server $hostname || exit 1 + + # Fix up the local krb5.conf to point to the remote + sed -e "s/__REALM__/$REALM/g" -e "s#__K5ROOT__#$K5ROOT#g" \ + -e "s/__KDCHOST__/$hostname/g" \ + < $TESTDIR/proto/krb5.conf.proto > $K5ROOT/krb5.conf # Using /usr/ucb/rsh and getting rid of "-k $REALM" until we get # around to fixing the fact that Kerberos rsh doesn't strip out "-k # REALM" when falling back. START_SERVERS_LOCAL=`echo $START_SERVERS_LOCAL|sed "s%$TOP%$rempath%"` - CMD="$RSH_CMD $hostname -l root -n \ - \"cd $rempath; \\\`testing/scripts/find-make.sh\\\` execute VERBOSE_TEST=$VERBOSE_TEST \ - TOP=$rempath \ - CMD='$START_SERVERS_LOCAL $rempath'\"" + CMD="$RSH_CMD $hostname -n \ + \"sh -c 'VERBOSE_TEST=$VERBOSE_TEST TOP=$rempath \ + $rempath/testing/scripts/env-setup.sh \ + $START_SERVERS_LOCAL $rempath'\"" if $VERBOSE; then echo "+++" |