diff options
Diffstat (limited to 'src/include/krb5')
| -rw-r--r-- | src/include/krb5/ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/krb5/Makefile.in | 2 | ||||
| -rw-r--r-- | src/include/krb5/stock/ChangeLog | 6 | ||||
| -rw-r--r-- | src/include/krb5/stock/osconf.h | 4 |
4 files changed, 15 insertions, 2 deletions
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index dcce9d0a7..bbc1d8b97 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,8 @@ +2006-03-06 Ken Raeburn <raeburn@mit.edu> + + * Makefile.in (PROCESS_REPLACE): Use MODULE_DIR instead of + KRB5_DB_MODULE_DIR. + 2005-11-17 Ken Raeburn <raeburn@mit.edu> * Makefile.in (osconf.h): Always remove osconf.new. diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in index 429b35515..7ef43d413 100644 --- a/src/include/krb5/Makefile.in +++ b/src/include/krb5/Makefile.in @@ -47,7 +47,7 @@ PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \ -e "s+@BINDIR+$(BINDIR)+" \ -e "s+@LIBDIR+$(LIBDIR)+" \ -e "s+@SBINDIR+$(SBINDIR)+" \ - -e "s+@MODULEDIR+$(KRB5_DB_MODULE_DIR)+" \ + -e "s+@MODULEDIR+$(MODULE_DIR)+" \ -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \ -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog index cfa6cb4de..c341acea6 100644 --- a/src/include/krb5/stock/ChangeLog +++ b/src/include/krb5/stock/ChangeLog @@ -1,3 +1,9 @@ +2006-03-06 Ken Raeburn <raeburn@mit.edu> + + * osconf.h (DEFAULT_KDB_LIB_PATH): Add "/kdb" on end of + MODULEDIR. + (MODULE_PATH): New macro. + 2005-06-29 Ken Raeburn <raeburn@mit.edu> * osconf.h (DEFAULT_KDB_LIB_PATH): Use @MODULEDIR. Don't use a diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h index 367109b11..03b2ce651 100644 --- a/src/include/krb5/stock/osconf.h +++ b/src/include/krb5/stock/osconf.h @@ -63,7 +63,9 @@ /* Location of KDC profile */ #define DEFAULT_KDC_PROFILE "@LOCALSTATEDIR/krb5kdc/kdc.conf" #define KDC_PROFILE_ENV "KRB5_KDC_PROFILE" -#define DEFAULT_KDB_LIB_PATH { "@MODULEDIR", NULL } + +#define DEFAULT_KDB_LIB_PATH { "@MODULEDIR/kdb", NULL } +#define MODULE_PATH "@MODULEDIR" #define DEFAULT_KDC_ENCTYPE ENCTYPE_DES3_CBC_SHA1 #define KDCRCACHE "dfl:krb5kdc_rcache" |