Remove store_master_key from the DAL table, and implement

krb5_store_master_key in terms of krb5_store_master_key_list.

ticket: 6749
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24168 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 0 insertions, 21 deletions

diff --git a/src/include/kdb.h b/src/include/kdb.h
index b959b15728..f7765c58b0 100644
--- a/src/include/kdb.h
+++ b/src/include/kdb.h
@@ -688,14 +688,6 @@ krb5_dbe_def_search_enctype( krb5_context kcontext,
                              krb5_key_data **kdatap);
 
 krb5_error_code
-krb5_def_store_mkey( krb5_context context,
-                     char *keyfile,
-                     krb5_principal mname,
-                     krb5_kvno kvno,
-                     krb5_keyblock *key,
-                     char *master_pwd);
-
-krb5_error_code
 krb5_def_store_mkey_list( krb5_context context,
                           char *keyfile,
                           krb5_principal mname,
@@ -1124,19 +1116,6 @@ typedef struct _kdb_vftabl {
                                            krb5_keylist_node **keylist);
 
     /*
-     * Optional with default: Save a master keyblock into the stash file
-     * db_arg.  master_pwd indicates the password used to derive the keyblock,
-     * if it is known.  mname is the name of the master principal for the
-     * realm.
-     *
-     * The default implementation ignores master_pwd and saves the master key
-     * in a keytab-format file.
-     */
-    krb5_error_code (*store_master_key)(krb5_context kcontext, char *db_arg,
-                                        krb5_principal mname, krb5_kvno kvno,
-                                        krb5_keyblock *key, char *master_pwd);
-
-    /*
      * Optional with default: Retrieve a master keyblock from the stash file
      * db_args, filling in *key and *kvno.  mname is the name of the master
      * principal for the realm.