diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/k5-int.h | 5 | ||||
| -rw-r--r-- | src/include/kdb.h | 15 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 4b0a0937e9..b9abd8a34b 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -1803,6 +1803,11 @@ krb5int_make_srv_query_realm(const krb5_data *realm, void krb5int_free_srv_dns_data(struct srv_dns_entry *); #endif +/* value to use when requesting a keytab entry and KVNO doesn't matter */ +#define IGNORE_VNO 0 +/* value to use when requesting a keytab entry and enctype doesn't matter */ +#define IGNORE_ENCTYPE 0 + /* * Convenience function for structure magic number */ diff --git a/src/include/kdb.h b/src/include/kdb.h index 66e8d0698b..cc5951d464 100644 --- a/src/include/kdb.h +++ b/src/include/kdb.h @@ -275,8 +275,9 @@ krb5_error_code krb5_db_get_mkey ( krb5_context kcontext, krb5_error_code krb5_db_free_master_key ( krb5_context kcontext, krb5_keyblock *key ); krb5_error_code krb5_db_store_master_key ( krb5_context kcontext, - char *db_arg, + char *keyfile, krb5_principal mname, + krb5_kvno kvno, krb5_keyblock *key, char *master_pwd); krb5_error_code krb5_db_fetch_mkey ( krb5_context context, @@ -285,11 +286,13 @@ krb5_error_code krb5_db_fetch_mkey ( krb5_context context, krb5_boolean fromkeyboard, krb5_boolean twice, char *db_args, + krb5_kvno *kvno, krb5_data *salt, krb5_keyblock *key); -krb5_error_code krb5_db_verify_master_key ( krb5_context kcontext, +krb5_error_code krb5_db_verify_master_key ( krb5_context kcontext, krb5_principal mprinc, - krb5_keyblock *mkey ); + krb5_kvno kvno, + krb5_keyblock *mkey ); krb5_error_code krb5_dbe_find_enctype( krb5_context kcontext, krb5_db_entry *dbentp, @@ -432,6 +435,7 @@ krb5_error_code krb5_def_store_mkey( krb5_context context, char *keyfile, krb5_principal mname, + krb5_kvno kvno, krb5_keyblock *key, char *master_pwd); @@ -440,12 +444,13 @@ krb5_error_code krb5_db_def_fetch_mkey( krb5_context context, krb5_principal mname, krb5_keyblock *key, - int *kvno, + krb5_kvno *kvno, char *db_args); krb5_error_code -krb5_def_verify_master_key( krb5_context context, +krb5_def_verify_master_key( krb5_context context, krb5_principal mprinc, + krb5_kvno kvno, krb5_keyblock *mkey); krb5_error_code kdb_def_set_mkey ( krb5_context kcontext, |