diff options
author | Greg Hudson <ghudson@mit.edu> | 2010-07-03 19:22:08 +0000 |
---|---|---|
committer | Greg Hudson <ghudson@mit.edu> | 2010-07-03 19:22:08 +0000 |
commit | 640690c6555142190fc81575bcdbb2122994c7a6 (patch) | |
tree | 29fe32d6391c7248f423607db9a8f9980faf5df2 /src/include | |
parent | ae8860583d2c2356b165a7936b8bcd2984e1a9a1 (diff) | |
download | krb5-640690c6555142190fc81575bcdbb2122994c7a6.zip krb5-640690c6555142190fc81575bcdbb2122994c7a6.tar.gz krb5-640690c6555142190fc81575bcdbb2122994c7a6.tar.bz2 |
Make the APIs for iterate, get_master_key_list, set_master_key_list,
and promote_db return KRB5_PLUGIN_OP_NOTSUPP if the KDB module does
not implement them, avoiding the need for stub default
implementations.
ticket: 6749
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24171 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/kdb.h | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/src/include/kdb.h b/src/include/kdb.h index 425e724..a576eb9 100644 --- a/src/include/kdb.h +++ b/src/include/kdb.h @@ -708,12 +708,6 @@ krb5_def_fetch_mkey_list( krb5_context context, krb5_kvno mkvno, krb5_keylist_node **mkeys_list); -krb5_error_code kdb_def_set_mkey_list ( krb5_context kcontext, - krb5_keylist_node *keylist ); - -krb5_error_code kdb_def_get_mkey_list ( krb5_context kcontext, - krb5_keylist_node **keylist ); - krb5_error_code krb5_dbe_def_cpw( krb5_context context, krb5_keyblock * master_key, @@ -725,9 +719,6 @@ krb5_dbe_def_cpw( krb5_context context, krb5_db_entry * db_entry); krb5_error_code -krb5_def_promote_db(krb5_context, char *, char **); - -krb5_error_code krb5_dbe_def_decrypt_key_data( krb5_context context, const krb5_keyblock * mkey, const krb5_key_data * key_data, @@ -1096,20 +1087,18 @@ typedef struct _kdb_vftabl { void (*free)(krb5_context kcontext, void *ptr); /* - * 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. + * Optional: Inform the module of the master key list. 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. */ krb5_error_code (*set_master_key_list)(krb5_context kcontext, krb5_keylist_node *keylist); /* - * Optional with default: Retrieve an alias to the master key list as - * previously set by set_master_key_list. This function is used by the KDB - * keytab implementation in libkdb5, which is used by kadmind. The default - * implementation returns success without modifying *keylist, which is an - * invalid implementation. + * Optional: Retrieve an alias to the master key list as previously set by + * set_master_key_list. This function is used by the KDB keytab + * implementation in libkdb5, which is used by kadmind. */ krb5_error_code (*get_master_key_list)(krb5_context kcontext, krb5_keylist_node **keylist); @@ -1195,13 +1184,10 @@ typedef struct _kdb_vftabl { krb5_db_entry *db_entry); /* - * Optional with default: Promote a temporary database to be the live one. - * kdb5_util load opens the database with the "temporary" db_arg and then - * invokes this function when the load is complete, thus replacing the live + * Optional: Promote a temporary database to be the live one. kdb5_util + * load opens the database with the "temporary" db_arg and then invokes + * this function when the load is complete, thus replacing the live * database with no loss of read availability. - * - * The default implementation returns KRB5_PLUGIN_OP_NOTSUPP; kdb5_util - * dump recognizes and ignores this error code. */ krb5_error_code (*promote_db)(krb5_context context, char *conf_section, char **db_args); |