diff options
| author | Theodore Tso <tytso@mit.edu> | 1997-03-24 17:20:34 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1997-03-24 17:20:34 +0000 |
| commit | 79ec575b6b49781045aac86d77e03f35bdc50ca3 (patch) | |
| tree | 75a10f45be853ca3d878ee86766db233fd8f2ce6 /src/lib | |
| parent | 9fb7729a1e0808569313b40febff20a687f57e6e (diff) | |
| download | krb5-79ec575b6b49781045aac86d77e03f35bdc50ca3.tar.gz krb5-79ec575b6b49781045aac86d77e03f35bdc50ca3.tar.xz krb5-79ec575b6b49781045aac86d77e03f35bdc50ca3.zip | |
t_kdb.c (do_testing): Clean up error handling for krb5_init_context
Makefile.in (check): Define and use KRB5_CONFIG_SETUP which sets up
the environment variables appropriately.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10022 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kdb/ChangeLog | 7 | ||||
| -rw-r--r-- | src/lib/kdb/Makefile.in | 7 | ||||
| -rw-r--r-- | src/lib/kdb/t_kdb.c | 7 |
3 files changed, 13 insertions, 8 deletions
diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index 7693dc1f49..fa3a680930 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,3 +1,10 @@ +Mon Mar 24 12:19:03 1997 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * t_kdb.c (do_testing): Clean up error handling for krb5_init_context. + + * Makefile.in (check): Define and use KRB5_CONFIG_SETUP which sets + up the environment variables appropriately. + Sun Mar 16 21:20:00 1997 Tom Yu <tlyu@mit.edu> * keytab.c: Don't assume dbm_db_get_mkey() and dbe_find_enctype diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index 90e73b28b8..b842f95242 100644 --- a/src/lib/kdb/Makefile.in +++ b/src/lib/kdb/Makefile.in @@ -1,5 +1,6 @@ CFLAGS = $(CCOPTS) $(DEFS) KRB5_RUN_ENV = @KRB5_RUN_ENV@ +KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ; PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -51,10 +52,8 @@ t_kdb: t_kdb.o $(OBJS) $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o t_kdb t_kdb.o $(OBJS) $(KDB5_LIBS) $(KRB5_BASE_LIBS) check:: t_kdb - KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ - $(KRB5_RUN_ENV) ./t_kdb -tcv - KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ - $(KRB5_RUN_ENV) ./t_kdb -tcvr + $(KRB5_CONFIG_SETUP) $(KRB5_RUN_ENV) ./t_kdb -tcv + $(KRB5_CONFIG_SETUP) $(KRB5_RUN_ENV) ./t_kdb -tcvr clean:: $(RM) t_kdb t_kdb.o diff --git a/src/lib/kdb/t_kdb.c b/src/lib/kdb/t_kdb.c index 1f727654a7..799df31a1f 100644 --- a/src/lib/kdb/t_kdb.c +++ b/src/lib/kdb/t_kdb.c @@ -487,11 +487,10 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean, oparg = ""; /* Set up some initial context */ + op = "initializing krb5"; kret = krb5_init_context(&kcontext); - if (kret) { - com_err(programname, kret, "while initializing krb5"); - exit(1); - } + if (kret) + goto goodbye; /* * The database had better not exist. |