From 7eb792506a894fefb40dd99b20856790fe6cf19e Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Fri, 30 Jun 2006 23:11:29 +0000 Subject: [PATCH] pull up r18292 from trunk r18292@cathode-dark-space: raeburn | 2006-06-30 16:18:39 -0400 ticket: 3964 status: open * kdb_default.c (krb5_def_promote_db): New function. * kdb5.c (kdb_setup_opt_functions): Use it if promote_db is null. * libkdb5.exports: Export krb5_db_promote. ticket: 3964 version_fixed: 1.5 git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-5@18304 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kdb/kdb5.c | 4 ++++ src/lib/kdb/kdb_default.c | 6 ++++++ src/lib/kdb/libkdb5.exports | 1 + 3 files changed, 11 insertions(+) diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c index 46f0eeb8f..d59a7cf76 100644 --- a/src/lib/kdb/kdb5.c +++ b/src/lib/kdb/kdb5.c @@ -217,6 +217,10 @@ kdb_setup_opt_functions(db_library lib) if (lib->vftabl.store_master_key == NULL) { lib->vftabl.store_master_key = krb5_def_store_mkey; } + + if (lib->vftabl.promote_db == NULL) { + lib->vftabl.promote_db = krb5_def_promote_db; + } } static int kdb_db2_pol_err_loaded = 0; diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c index 4eb0f51f3..715333056 100644 --- a/src/lib/kdb/kdb_default.c +++ b/src/lib/kdb/kdb_default.c @@ -329,3 +329,9 @@ krb5_error_code kdb_def_get_mkey ( krb5_context kcontext, return 0; } +krb5_error_code krb5_def_promote_db (krb5_context kcontext, + char *s, char **args) +{ + printf("default promote_db\n"); + return EINVAL; +} diff --git a/src/lib/kdb/libkdb5.exports b/src/lib/kdb/libkdb5.exports index fe2fae649..dd9f95288 100644 --- a/src/lib/kdb/libkdb5.exports +++ b/src/lib/kdb/libkdb5.exports @@ -48,3 +48,4 @@ krb5_db_iter_policy krb5_db_delete_policy krb5_db_free_policy krb5_def_store_mkey +krb5_db_promote -- 2.26.2