diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/kdb/Makefile.in | 3 | ||||
| -rw-r--r-- | src/lib/kdb/kdb5.c | 4 | ||||
| -rw-r--r-- | src/lib/krb5/error_tables/kdb5_err.et | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index c450a9819..3781dfb9a 100644 --- a/src/lib/kdb/Makefile.in +++ b/src/lib/kdb/Makefile.in @@ -8,8 +8,9 @@ CFLAGS=@CFLAGS@ -DKDB5_USE_LIB_KDB_DB2 LOCALINCLUDES= -I. DEFS= +# Keep LIBMAJOR in sync with KRB5_KDB_API_VERSION in include/kdb.h. LIBBASE=kdb5 -LIBMAJOR=4 +LIBMAJOR=5 LIBMINOR=0 LIBINITFUNC=kdb_init_lock_list LIBFINIFUNC=kdb_fini_lock_list diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c index a7e1bb5c1..c4c7ec6dc 100644 --- a/src/lib/kdb/kdb5.c +++ b/src/lib/kdb/kdb5.c @@ -311,7 +311,7 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library *libptr) memcpy(&lib->vftabl, vftabl_addr, sizeof(kdb_vftabl)); kdb_setup_opt_functions(lib); - status = lib->vftabl.init_library(); + status = lib->vftabl.init_library(KRB5_KDB_DAL_VERSION); if (status) goto cleanup; @@ -408,7 +408,7 @@ kdb_load_library(krb5_context kcontext, char *lib_name, db_library * lib) memcpy(&(*lib)->vftabl, vftabl_addrs[0], sizeof(kdb_vftabl)); kdb_setup_opt_functions(*lib); - if ((status = (*lib)->vftabl.init_library())) + if ((status = (*lib)->vftabl.init_library(KRB5_KDB_DAL_VERSION))) goto clean_n_exit; clean_n_exit: diff --git a/src/lib/krb5/error_tables/kdb5_err.et b/src/lib/krb5/error_tables/kdb5_err.et index cd7214d9b..f6b97dc9d 100644 --- a/src/lib/krb5/error_tables/kdb5_err.et +++ b/src/lib/krb5/error_tables/kdb5_err.et @@ -82,5 +82,6 @@ ec KRB5_LOG_CONV, "Update log conversion error" ec KRB5_LOG_UNSTABLE, "Update log is unstable" ec KRB5_LOG_CORRUPT, "Update log is corrupt" ec KRB5_LOG_ERROR, "Generic update log error" +ec KRB5_KDB_DBTYPE_MISMATCH, "Database module does not match KDC version" end |