diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2002-10-30 23:07:23 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2002-10-30 23:07:23 +0000 |
| commit | 0c35e9dea5b172f4810ff2876e80eb1325600d71 (patch) | |
| tree | 58d4087f18e6f5af9ae48a520df7daef819d38b0 /src/kadmin/testing | |
| parent | fa7e04c804fd9b716b72e51398926b0f9fafc72f (diff) | |
| download | krb5-0c35e9dea5b172f4810ff2876e80eb1325600d71.zip krb5-0c35e9dea5b172f4810ff2876e80eb1325600d71.tar.gz krb5-0c35e9dea5b172f4810ff2876e80eb1325600d71.tar.bz2 | |
* 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
Diffstat (limited to 'src/kadmin/testing')
| -rw-r--r-- | src/kadmin/testing/scripts/ChangeLog | 6 | ||||
| -rw-r--r-- | src/kadmin/testing/scripts/start_servers_local | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog index 04da649..8a413c4 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 e94d139..707888d 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) \ |