diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2006-03-14 01:39:24 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2006-03-14 01:39:24 +0000 |
| commit | a2fa7371ff2b427d74bdfb849951e8e1f428e80c (patch) | |
| tree | 82ee92c4308b239e4063476acb5901318f48bd64 /src | |
| parent | c3f6e181e266f8469925930600bdaf3601eca321 (diff) | |
| download | krb5-a2fa7371ff2b427d74bdfb849951e8e1f428e80c.tar.gz krb5-a2fa7371ff2b427d74bdfb849951e8e1f428e80c.tar.xz krb5-a2fa7371ff2b427d74bdfb849951e8e1f428e80c.zip | |
* Makefile.in (krb5.conf): New target. Use config-files/krb5.conf, but
add db_module_dir tag.
(kdb_check): Depend on it.
(RUN_SETUP): Use it for KRB5_CONFIG.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17739 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/tests/ChangeLog | 7 | ||||
| -rw-r--r-- | src/tests/Makefile.in | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/tests/ChangeLog b/src/tests/ChangeLog index bc2c3c6ed..e7426f672 100644 --- a/src/tests/ChangeLog +++ b/src/tests/ChangeLog @@ -1,3 +1,10 @@ +2006-03-13 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (krb5.conf): New target. Use + config-files/krb5.conf, but add db_module_dir tag. + (kdb_check): Depend on it. + (RUN_SETUP): Use it for KRB5_CONFIG. + 2005-08-20 Ken Raeburn <raeburn@mit.edu> * configure.in: Use K5_AC_INIT instead of AC_INIT. diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index c1261adc4..01502f35a 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -4,7 +4,7 @@ BUILDTOP=$(REL).. LOCAL_SUBDIRS = resolve asn.1 create hammer verify gssapi dejagnu shlib \ gss-threads misc -RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf +RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=krb5.conf KRB5_RUN_ENV= @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) @@ -28,8 +28,13 @@ kdc.conf: Makefile @echo " key_stash_file = `pwd`/stash_file" >> kdc.conf @echo "}" >> kdc.conf +krb5.conf: Makefile + cat $(SRCTOP)/config-files/krb5.conf > krb5.new + echo "[db_modules]" >> krb5.new + echo " db_module_dir = `pwd`/../util/fakedest$(KRB5_DB_MODULE_DIR)" >> krb5.new + mv krb5.new krb5.conf -kdb_check: kdc.conf +kdb_check: kdc.conf krb5.conf $(RM) $(TEST_DB)* $(RUN_SETUP) ../kadmin/dbutil/kdb5_util $(KADMIN_OPTS) create $(RUN_SETUP) ../tests/create/kdb5_mkdums $(KTEST_OPTS) |