From 41f6fee5e77e49732ae7c71808204aeb77aa1013 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Wed, 15 Sep 2010 17:13:34 +0000 Subject: 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/plugins/kdb/db2/db2_exp.c | 10 ---------- src/plugins/kdb/db2/kdb_db2.c | 25 ------------------------- src/plugins/kdb/db2/kdb_db2.h | 7 ------- 3 files changed, 42 deletions(-) (limited to 'src/plugins/kdb/db2') diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c index 327a6b822..b2418ab00 100644 --- a/src/plugins/kdb/db2/db2_exp.c +++ b/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, diff --git a/src/plugins/kdb/db2/kdb_db2.c b/src/plugins/kdb/db2/kdb_db2.c index f5f8f7b0d..0a35e3a71 100644 --- a/src/plugins/kdb/db2/kdb_db2.c +++ b/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 diff --git a/src/plugins/kdb/db2/kdb_db2.h b/src/plugins/kdb/db2/kdb_db2.h index f7c68bc91..8c94551fd 100644 --- a/src/plugins/kdb/db2/kdb_db2.h +++ b/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); -- cgit