diff options
| author | Will Fiveash <will.fiveash@oracle.com> | 2008-08-15 00:38:41 +0000 |
|---|---|---|
| committer | Will Fiveash <will.fiveash@oracle.com> | 2008-08-15 00:38:41 +0000 |
| commit | c438b327af4cf5ba96ed3f7e02b6327b9d06c1ae (patch) | |
| tree | 6a65a30d2f7c368d8d29b9755ec52bb082f908c4 /src/include/kdb.h | |
| parent | 7b2fd388c28d4c8a3a7a2a4bf2b70a251bf037e8 (diff) | |
| download | krb5-c438b327af4cf5ba96ed3f7e02b6327b9d06c1ae.tar.gz krb5-c438b327af4cf5ba96ed3f7e02b6327b9d06c1ae.tar.xz krb5-c438b327af4cf5ba96ed3f7e02b6327b9d06c1ae.zip | |
a stash file is not a keytab
Note, this is the commit for the associated Krb Consortium project:
Projects/Masterkey Keytab Stash
ticket: 194
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20661 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/kdb.h')
| -rw-r--r-- | src/include/kdb.h | 15 |
1 files changed, 10 insertions, 5 deletions
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, |