diff options
author | Greg Hudson <ghudson@mit.edu> | 2010-07-02 17:13:40 +0000 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2010-07-02 17:13:40 +0000 |
commit | 3dd263c9e18f52a115ab16213c37ee4132d56961 (patch) | |
tree | d2606d63e2c0cb4a87d33e9bab7eb75ce0ae8dc5 /src/include | |
parent | cd332f86e3559fa13eaad7b33485fd1047fcd16c (diff) | |
download | krb5-3dd263c9e18f52a115ab16213c37ee4132d56961.zip krb5-3dd263c9e18f52a115ab16213c37ee4132d56961.tar.gz krb5-3dd263c9e18f52a115ab16213c37ee4132d56961.tar.bz2 |
Remove the set_master_key and get_master_key DAL interfaces and their
corresponding libkdb5 APIs, as they were not productively used. In
kdb5_ldap_util, stop using the realm data's mkey field as a container
to communicate the master key to static helper functions, since the
field no longer exists.
ticket: 6749
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24162 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/kdb.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/src/include/kdb.h b/src/include/kdb.h index e8e82eb..31f2b13 100644 --- a/src/include/kdb.h +++ b/src/include/kdb.h @@ -447,13 +447,6 @@ krb5_error_code krb5_db_iterate ( krb5_context kcontext, char *match_entry, int (*func) (krb5_pointer, krb5_db_entry *), krb5_pointer func_arg ); -krb5_error_code krb5_db_set_master_key_ext ( krb5_context kcontext, - char *pwd, - krb5_keyblock *key ); -krb5_error_code krb5_db_set_mkey ( krb5_context context, - krb5_keyblock *key); -krb5_error_code krb5_db_get_mkey ( krb5_context kcontext, - krb5_keyblock **key ); krb5_error_code krb5_db_set_mkey_list( krb5_context context, krb5_keylist_node * keylist); @@ -736,16 +729,9 @@ krb5_def_fetch_mkey_list( krb5_context context, krb5_kvno mkvno, krb5_keylist_node **mkeys_list); -krb5_error_code kdb_def_set_mkey ( krb5_context kcontext, - char *pwd, - krb5_keyblock *key ); - krb5_error_code kdb_def_set_mkey_list ( krb5_context kcontext, krb5_keylist_node *keylist ); -krb5_error_code kdb_def_get_mkey ( krb5_context kcontext, - krb5_keyblock **key ); - krb5_error_code kdb_def_get_mkey_list ( krb5_context kcontext, krb5_keylist_node **keylist ); @@ -1149,26 +1135,6 @@ typedef struct _kdb_vftabl { /* * Optional with default: Inform the module of the master key. The module * may remember an alias to the provided memory. This function is called - * at startup by the KDC and kadmind; both supply a NULL pwd argument. The - * module should not need to use a remembered master key value, so current - * modules do nothing with it besides return it from get_master_key, which - * is never used. The default implementation does nothing. - */ - krb5_error_code (*set_master_key)(krb5_context kcontext, char *pwd, - krb5_keyblock *key); - - /* - * Optional with default: Retrieve an alias to the master keyblock as - * previously set by set_master_key. This function is not used. The - * default implementation returns success without modifying *key, which - * would be an invalid implementation if it were ever used. - */ - krb5_error_code (*get_master_key)(krb5_context kcontext, - krb5_keyblock **key); - - /* - * Optional with default: Inform the module of the master key. The module - * may remember an alias to the provided memory. This function is called * at startup by the KDC and kadmind with the value returned by * fetch_master_key_list. The default implementation does nothing. */ |