* 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 04da649142c9e1b678d9188bbc452479a9a29f47..8a413c4d64a6e9913f98f99c90823b901dad3351 100644 (file)
--- 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 e94d13998013b6f2b7ac7c6b8330221a4b98fef6..707888d3197d28b78243c52ab3d34c45a551e4ea 100644 (file)
--- 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) \