From 177975bb4e463da07c756f6603e9f4adc97d3cfa Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 2 Jul 2010 20:16:21 +0000 Subject: Remove store_master_key from the DAL table, and implement krb5_store_master_key in terms of krb5_store_master_key_list. ticket: 6749 status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24168 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/kdb/kdb5.c | 17 ++++++----------- src/lib/kdb/kdb_default.c | 17 ----------------- src/lib/kdb/libkdb5.exports | 1 - 3 files changed, 6 insertions(+), 29 deletions(-) (limited to 'src/lib') diff --git a/src/lib/kdb/kdb5.c b/src/lib/kdb/kdb5.c index b06cf76c5..7b31a96dc 100644 --- a/src/lib/kdb/kdb5.c +++ b/src/lib/kdb/kdb5.c @@ -260,8 +260,6 @@ kdb_setup_opt_functions(db_library lib) lib->vftabl.dbe_search_enctype = krb5_dbe_def_search_enctype; if (lib->vftabl.change_pwd == NULL) lib->vftabl.change_pwd = krb5_dbe_def_cpw; - 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; if (lib->vftabl.decrypt_key_data == NULL) @@ -1132,16 +1130,13 @@ krb5_db_store_master_key(krb5_context kcontext, krb5_kvno kvno, krb5_keyblock * key, char *master_pwd) { - krb5_error_code status = 0; - kdb_vftabl *v; + krb5_keylist_node list; - status = get_vftabl(kcontext, &v); - if (status) - return status; - if (v->store_master_key == NULL) - return KRB5_KDB_DBTYPE_NOSUP; - return v->store_master_key(kcontext, keyfile, mname, kvno, key, - master_pwd); + list.kvno = kvno; + list.keyblock = *key; + list.next = NULL; + return krb5_db_store_master_key_list(kcontext, keyfile, mname, &list, + master_pwd); } krb5_error_code diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c index d78c13cb1..d9b95c793 100644 --- a/src/lib/kdb/kdb_default.c +++ b/src/lib/kdb/kdb_default.c @@ -233,23 +233,6 @@ out: return retval; } -krb5_error_code -krb5_def_store_mkey(krb5_context context, - char *keyfile, - krb5_principal mname, - krb5_kvno kvno, - krb5_keyblock *key, - char *master_pwd) -{ - krb5_keylist_node list; - - list.kvno = kvno; - list.keyblock = *key; - list.next = NULL; - return krb5_def_store_mkey_list(context, keyfile, mname, &list, - master_pwd); -} - static krb5_error_code krb5_db_def_fetch_mkey_stash(krb5_context context, const char *keyfile, diff --git a/src/lib/kdb/libkdb5.exports b/src/lib/kdb/libkdb5.exports index 4111ef0f0..4a2576a30 100644 --- a/src/lib/kdb/libkdb5.exports +++ b/src/lib/kdb/libkdb5.exports @@ -71,7 +71,6 @@ krb5_db_put_policy krb5_db_iter_policy krb5_db_delete_policy krb5_db_free_policy -krb5_def_store_mkey krb5_def_store_mkey_list krb5_db_promote ulog_map -- cgit