From: Ken Raeburn <raeburn@mit.edu>
Date: Wed, 30 Oct 2002 23:07:23 +0000 (+0000)
Subject: * start_servers_local: If $USER isn't set, use $LOGNAME.  If ovsec_kadm_srv_tcl
X-Git-Tag: krb5-1.3-alpha1~304
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0c35e9dea5b172f4810ff2876e80eb1325600d71;p=krb5.git

* start_servers_local: If $USER isn't set, use $LOGNAME.  If ovsec_kadm_srv_tcl
invocation to do some initialization fails, exit rather than continuing.

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

diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index 04da64914..8a413c4d6 100644
--- a/src/kadmin/testing/scripts/ChangeLog
+++ b/src/kadmin/testing/scripts/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-30  Ken Raeburn  <raeburn@mit.edu>
+
+	* start_servers_local: If $USER isn't set, use $LOGNAME.  If
+	ovsec_kadm_srv_tcl invocation to do some initialization fails,
+	exit rather than continuing.
+
 2002-10-17  Ken Raeburn  <raeburn@mit.edu>
 
 	* start_servers_local: Set names of replay cache and log files to
diff --git a/src/kadmin/testing/scripts/start_servers_local b/src/kadmin/testing/scripts/start_servers_local
index e94d13998..707888d31 100644
--- a/src/kadmin/testing/scripts/start_servers_local
+++ b/src/kadmin/testing/scripts/start_servers_local
@@ -102,7 +102,9 @@ puts stdout [ovsec_kadm_create_principal $server_handle \
 puts stdout [ovsec_kadm_destroy $server_handle]
 EOF
 eval "$SRVTCL < /tmp/start_servers_local$$ $REDIRECT"
+x=$?
 rm /tmp/start_servers_local$$
+if test $x != 0 ; then exit 1 ; fi
 
 # rm -f /etc/v5srvtab
 # eval $LOCAL_MAKE_KEYTAB -princ host/xCANONHOSTx /etc/v5srvtab $REDIRECT
@@ -114,6 +116,10 @@ kdc_start_file=/tmp/kdc_server_start.$$
 
 rm -f $kdc_start_file
 
+if test "x$USER" = x ; then
+  USER=$LOGNAME ; export USER
+fi
+
 kdc_args="-R dfl:kdc_rcache.$USER"
 
 (trap "" 2; cd $TOP/../kdc; ./krb5kdc $kdc_args; touch $kdc_start_file) \