From: Greg Hudson <ghudson@mit.edu>
Date: Fri, 2 Jul 2010 17:18:46 +0000 (+0000)
Subject: Remove setup_master_key_name from the DAL table as it was not used
X-Git-Tag: krb5-1.9-beta1~168
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=beeab09509ed1e46e1fbe4358c6388caf0dcdc61;p=krb5.git

Remove setup_master_key_name from the DAL table as it was not used

ticket: 6749
status: open

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

diff --git a/src/include/kdb.h b/src/include/kdb.h
index 31f2b1350..4406126b9 100644
--- a/src/include/kdb.h
+++ b/src/include/kdb.h
@@ -1151,12 +1151,6 @@ typedef struct _kdb_vftabl {
     krb5_error_code (*get_master_key_list)(krb5_context kcontext,
                                            krb5_keylist_node **keylist);
 
-    /* This function has no entry point in libkdb5; leave it as NULL. */
-    krb5_error_code (*setup_master_key_name)(krb5_context kcontext,
-                                             char *keyname, char *realm,
-                                             char **fullname,
-                                             krb5_principal *principal);
-
     /*
      * Optional with default: Save a master keyblock into the stash file
      * db_arg.  master_pwd indicates the password used to derive the keyblock,
diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c
index 74963cdd8..384d2eeda 100644
--- a/src/plugins/kdb/db2/db2_exp.c
+++ b/src/plugins/kdb/db2/db2_exp.c
@@ -246,7 +246,7 @@ kdb_vftabl PLUGIN_SYMBOL_NAME(krb5_db2, kdb_function_table) = {
     /* db_free */                                krb5_db2_free,
     /* set_master_key_list */                    wrap_krb5_db2_db_set_mkey_list,
     /* get_master_key_list */                    wrap_krb5_db2_db_get_mkey_list,
-    /* blah blah blah */ 0,0,0,0,0,0,0,0,
+    /* blah blah blah */ 0,0,0,0,0,0,0,
     /* promote_db */                             wrap_krb5_db2_promote_db,
     0, 0,
     /* invoke */                                 wrap_krb5_db2_invoke
diff --git a/src/plugins/kdb/ldap/ldap_exp.c b/src/plugins/kdb/ldap/ldap_exp.c
index 1846d9240..2b0fc62ef 100644
--- a/src/plugins/kdb/ldap/ldap_exp.c
+++ b/src/plugins/kdb/ldap/ldap_exp.c
@@ -74,7 +74,6 @@ kdb_vftabl PLUGIN_SYMBOL_NAME(krb5_ldap, kdb_function_table) = {
     /* optional functions */
     /* set_master_key_list */               krb5_ldap_set_mkey_list,
     /* get_master_key_list */               krb5_ldap_get_mkey_list,
-    /* setup_master_key_name */             NULL,
     /* store_master_key */                  NULL,
     /* fetch_master_key */                  NULL /* krb5_ldap_fetch_mkey */,
     /* verify_master_key */                 NULL /* krb5_ldap_verify_master_key */,