svn rev #24163: trunk/src/ include/ plugins/kdb/db2/ plugins/kdb/ldap/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24163
Commit By: ghudson
Log Message:
ticket: 6749
status: open

Remove setup_master_key_name from the DAL table as it was not used.



Changed Files:
U   trunk/src/include/kdb.h
U   trunk/src/plugins/kdb/db2/db2_exp.c
U   trunk/src/plugins/kdb/ldap/ldap_exp.c
Modified: trunk/src/include/kdb.h
===================================================================
--- trunk/src/include/kdb.h	2010-07-02 17:13:40 UTC (rev 24162)
+++ trunk/src/include/kdb.h	2010-07-02 17:18:46 UTC (rev 24163)
@@ -1151,12 +1151,6 @@
     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,

Modified: trunk/src/plugins/kdb/db2/db2_exp.c
===================================================================
--- trunk/src/plugins/kdb/db2/db2_exp.c	2010-07-02 17:13:40 UTC (rev 24162)
+++ trunk/src/plugins/kdb/db2/db2_exp.c	2010-07-02 17:18:46 UTC (rev 24163)
@@ -246,7 +246,7 @@
     /* 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

Modified: trunk/src/plugins/kdb/ldap/ldap_exp.c
===================================================================
--- trunk/src/plugins/kdb/ldap/ldap_exp.c	2010-07-02 17:13:40 UTC (rev 24162)
+++ trunk/src/plugins/kdb/ldap/ldap_exp.c	2010-07-02 17:18:46 UTC (rev 24163)
@@ -74,7 +74,6 @@
     /* 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 */,