diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-03-21 16:57:05 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-03-21 16:57:05 +0000 |
| commit | 57a0c5e6c3c3af0eeed0487d56b53311752a8930 (patch) | |
| tree | 887daeb4dcec0cdb6d1885327eacaacdf6ca46e0 /src/include/kdb.h | |
| parent | fd3a2c5a467a42bbb864e1ddc7fc7f5bda93e339 (diff) | |
| download | krb5-57a0c5e6c3c3af0eeed0487d56b53311752a8930.tar.gz krb5-57a0c5e6c3c3af0eeed0487d56b53311752a8930.tar.xz krb5-57a0c5e6c3c3af0eeed0487d56b53311752a8930.zip | |
Only store master mey list in DAL handle
r24314 (#6778) created a hybrid owernship model for the master key
list, with one virtual copy stored in the DAL handle and one provided
to the caller of krb5_db_fetch_mkey_list. Replace this with a model
where only the DAL handle owns the list, and a caller can get access
to an alias pointer with a new function krb5_db_mkey_list_alias().
Functions which previously accepted the master key list as an input
parameter now expect to find it in the DAL handle.
Patch by Will Fiveash <will.fiveash@oracle.com>.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25781 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/kdb.h')
| -rw-r--r-- | src/include/kdb.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/include/kdb.h b/src/include/kdb.h index 0f50a83c16..67c403155c 100644 --- a/src/include/kdb.h +++ b/src/include/kdb.h @@ -377,7 +377,6 @@ krb5_error_code krb5_db_store_master_key ( krb5_context kcontext, krb5_error_code krb5_db_store_master_key_list ( krb5_context kcontext, char *keyfile, krb5_principal mname, - krb5_keylist_node *keylist, char *master_pwd); krb5_error_code krb5_db_fetch_mkey ( krb5_context context, krb5_principal mname, @@ -391,15 +390,7 @@ krb5_error_code krb5_db_fetch_mkey ( krb5_context context, krb5_error_code krb5_db_fetch_mkey_list( krb5_context context, krb5_principal mname, - const krb5_keyblock * mkey, - krb5_kvno mkvno, - krb5_keylist_node **mkeys_list ); -/** - * Free a master keylist. - */ -void -krb5_db_free_mkey_list( krb5_context context, - krb5_keylist_node *mkey_list ); + const krb5_keyblock * mkey ); krb5_error_code krb5_dbe_find_enctype( krb5_context kcontext, @@ -451,14 +442,12 @@ krb5_dbe_fetch_act_key_list(krb5_context context, krb5_error_code krb5_dbe_find_act_mkey( krb5_context context, - krb5_keylist_node * mkey_list, krb5_actkvno_node * act_mkey_list, krb5_kvno * act_kvno, krb5_keyblock ** act_mkey); krb5_error_code krb5_dbe_find_mkey( krb5_context context, - krb5_keylist_node * mkey_list, krb5_db_entry * entry, krb5_keyblock ** mkey); @@ -468,11 +457,13 @@ krb5_dbe_lookup_mkvno( krb5_context context, krb5_db_entry * entry, krb5_kvno * mkvno); +krb5_keylist_node * +krb5_db_mkey_list_alias( krb5_context kcontext ); + /* Set *mkvno to mkvno in entry tl_data, or minimum value from mkey_list. */ krb5_error_code krb5_dbe_get_mkvno( krb5_context context, krb5_db_entry * entry, - krb5_keylist_node * mkey_list, krb5_kvno * mkvno); krb5_error_code @@ -698,7 +689,6 @@ krb5_error_code krb5_def_fetch_mkey_list( krb5_context context, krb5_principal mprinc, const krb5_keyblock *mkey, - krb5_kvno mkvno, krb5_keylist_node **mkeys_list); krb5_error_code @@ -1092,7 +1082,6 @@ typedef struct _kdb_vftabl { krb5_error_code (*fetch_master_key_list)(krb5_context kcontext, krb5_principal mname, const krb5_keyblock *key, - krb5_kvno kvno, krb5_keylist_node **mkeys_list); /* |