Remove dead code from DAL and kdb plugins

kdb: remove get/set_mkey_list

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

src/include/kdb.h

@@ -1012,23 +1012,6 @@ typedef struct _kdb_vftabl {
      */
     void (*free)(krb5_context kcontext, void *ptr);
 
-    /*
-     * Optional: Inform the module of the master key list.  The module may
-     * remember an alias to the provided memory.  This function is called at
-     * startup by the KDC and kadmind with the value returned by
-     * fetch_master_key_list.
-     */
-    krb5_error_code (*set_master_key_list)(krb5_context kcontext,
-                                           krb5_keylist_node *keylist);
-
-    /*
-     * Optional: Retrieve an alias to the master key list as previously set by
-     * set_master_key_list.  This function is used by the KDB keytab
-     * implementation in libkdb5, which is used by kadmind.
-     */
-    krb5_error_code (*get_master_key_list)(krb5_context kcontext,
-                                           krb5_keylist_node **keylist);
-
     /*
      * 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

src/plugins/kdb/db2/db2_exp.c

@@ -168,14 +168,6 @@ WRAP_VOID (krb5_db2_free_policy,
            ( krb5_context kcontext, osa_policy_ent_t entry ),
            (kcontext, entry));
 
-WRAP_K (krb5_db2_set_mkey_list,
-        ( krb5_context kcontext, krb5_keylist_node *keylist),
-        (kcontext, keylist));
-
-WRAP_K (krb5_db2_get_mkey_list,
-        ( krb5_context context, krb5_keylist_node **keylist),
-        (context, keylist));
-
 WRAP_K (krb5_db2_promote_db,
         ( krb5_context kcontext, char *conf_section, char **db_args ),
         (kcontext, conf_section, db_args));
@@ -241,8 +233,6 @@ kdb_vftabl PLUGIN_SYMBOL_NAME(krb5_db2, kdb_function_table) = {
     /* free_policy */                   wrap_krb5_db2_free_policy,
     /* alloc */                         krb5_db2_alloc,
     /* free */                          krb5_db2_free,
-    /* set_master_key_list */           wrap_krb5_db2_set_mkey_list,
-    /* get_master_key_list */           wrap_krb5_db2_get_mkey_list,
     /* blah blah blah */ 0,0,0,0,0,
     /* promote_db */                    wrap_krb5_db2_promote_db,
     0, 0, 0, 0,

src/plugins/kdb/db2/kdb_db2.c

@@ -436,32 +436,7 @@ krb5_db2_fini(krb5_context context)
     return retval;
 }
 
-krb5_error_code
-krb5_db2_set_mkey_list(krb5_context context, krb5_keylist_node *key_list)
-{
-    krb5_db2_context *db_ctx;
-
-    if (!k5db2_inited(context))
-        return (KRB5_KDB_DBNOTINITED);
 
-    db_ctx = context->dal_handle->db_context;
-    db_ctx->db_master_key_list = key_list;
-    return 0;
-}
-
-krb5_error_code
-krb5_db2_get_mkey_list(krb5_context context, krb5_keylist_node **key_list)
-{
-    krb5_db2_context *db_ctx;
-
-    if (!k5db2_inited(context))
-        return (KRB5_KDB_DBNOTINITED);
-
-    db_ctx = context->dal_handle->db_context;
-    *key_list = db_ctx->db_master_key_list;
-
-    return 0;
-}
 
 /* Return successfully if the db2 name set in context can be opened. */
 static krb5_error_code

src/plugins/kdb/db2/kdb_db2.h

@@ -43,7 +43,6 @@ typedef struct _krb5_db2_context {
     int                 db_locks_held;  /* Number of times locked       */
     int                 db_lock_mode;   /* Last lock mode, e.g. greatest*/
     krb5_boolean        db_nb_locks;    /* [Non]Blocking lock modes     */
-    krb5_keylist_node *db_master_key_list;  /* Master key list of database */
     osa_adb_policy_t    policy_db;
     krb5_boolean        tempdb;
     krb5_boolean        disable_last_success;
@@ -78,12 +77,6 @@ krb5_boolean krb5_db2_set_lockmode(krb5_context, krb5_boolean);
 krb5_error_code krb5_db2_open_database(krb5_context);
 krb5_error_code krb5_db2_close_database(krb5_context);
 
-krb5_error_code
-krb5_db2_set_mkey_list(krb5_context context, krb5_keylist_node *keylist);
-
-krb5_error_code
-krb5_db2_get_mkey_list(krb5_context context, krb5_keylist_node **keylist);
-
 krb5_error_code
 krb5_db2_delete_principal(krb5_context context,
                           krb5_const_principal searchfor);

src/plugins/kdb/ldap/ldap_exp.c

@@ -72,8 +72,6 @@ kdb_vftabl PLUGIN_SYMBOL_NAME(krb5_ldap, kdb_function_table) = {
     /* alloc */                             krb5_ldap_alloc,
     /* free */                              krb5_ldap_free,
     /* optional functions */
-    /* set_master_key_list */               krb5_ldap_set_mkey_list,
-    /* get_master_key_list */               krb5_ldap_get_mkey_list,
     /* fetch_master_key */                  NULL /* krb5_ldap_fetch_mkey */,
     /* fetch_master_key_list */             NULL,
     /* store_master_key_list */             NULL,

src/plugins/kdb/ldap/libkdb_ldap/Makefile.in

@@ -50,7 +50,6 @@ SRCS= 	$(srcdir)/kdb_ldap.c \
 	$(srcdir)/ldap_services.c \
 	$(srcdir)/ldap_service_rights.c \
 	$(srcdir)/princ_xdr.c \
-	$(srcdir)/ldap_fetch_mkey.c \
 	$(srcdir)/ldap_service_stash.c \
 	$(srcdir)/kdb_xdr.c \
 	$(srcdir)/ldap_err.c \
@@ -71,7 +70,6 @@ STLIBOBJS= kdb_ldap.o \
 	ldap_services.o \
 	ldap_service_rights.o \
 	princ_xdr.o \
-	ldap_fetch_mkey.o \
 	ldap_service_stash.o \
 	kdb_xdr.o \
 	ldap_err.o \

src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h

@@ -265,12 +265,6 @@ krb5_ldap_alloc( krb5_context kcontext,  void *ptr, size_t size );
 void
 krb5_ldap_free( krb5_context kcontext, void *ptr );
 
-krb5_error_code
-krb5_ldap_get_mkey_list (krb5_context context, krb5_keylist_node **key_list);
-
-krb5_error_code
-krb5_ldap_set_mkey_list(krb5_context, krb5_keylist_node *);
-
 krb5_error_code
 krb5_ldap_create(krb5_context , char *, char **);
 

src/plugins/kdb/ldap/libkdb_ldap/ldap_realm.h

@@ -68,7 +68,6 @@ typedef struct _krb5_ldap_realm_params {
     char          **adminservers;
     char          **passwdservers;
     krb5_tl_data  *tl_data;
-    krb5_keylist_node *mkey_list; /* all master keys in use for the realm */
     long          mask;
 } krb5_ldap_realm_params;