From 6610517484ee9bc61f95b104cc287d51e72ba40f Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 2 Jul 2010 14:19:39 +0000 Subject: Remove errcode_2_string and release_errcode_string from the DAL table, and stop using them in kdb5.c. Modules can simply set error messages in the krb5 context on error. ticket: 6749 status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24159 dc483132-0cff-0310-8789-dd5450dbe970 --- src/plugins/kdb/db2/db2_exp.c | 2 -- src/plugins/kdb/ldap/ldap_exp.c | 2 -- src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h | 6 ------ src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c | 12 ------------ 4 files changed, 22 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c index b335068e8..174c60aa8 100644 --- a/src/plugins/kdb/db2/db2_exp.c +++ b/src/plugins/kdb/db2/db2_exp.c @@ -249,8 +249,6 @@ kdb_vftabl PLUGIN_SYMBOL_NAME(krb5_db2, kdb_function_table) = { /* db_iter_policy */ wrap_krb5_db2_iter_policy, /* db_delete_policy */ wrap_krb5_db2_delete_policy, /* db_free_policy */ wrap_krb5_db2_free_policy, - /* errcode_2_string */ NULL, - /* release_errcode_string */ NULL, /* db_alloc */ krb5_db2_alloc, /* db_free */ krb5_db2_free, /* set_master_key */ wrap_krb5_db2_set_master_key_ext, diff --git a/src/plugins/kdb/ldap/ldap_exp.c b/src/plugins/kdb/ldap/ldap_exp.c index e13b0d2eb..4d3b24929 100644 --- a/src/plugins/kdb/ldap/ldap_exp.c +++ b/src/plugins/kdb/ldap/ldap_exp.c @@ -69,8 +69,6 @@ kdb_vftabl PLUGIN_SYMBOL_NAME(krb5_ldap, kdb_function_table) = { /* db_iter_policy */ krb5_ldap_iterate_password_policy, /* db_delete_policy */ krb5_ldap_delete_password_policy, /* db_free_policy */ krb5_ldap_free_password_policy, - /* errcode_2_string */ krb5_ldap_errcode_2_string, - /* release_errcode_string */ krb5_ldap_release_errcode_string, /* db_alloc */ krb5_ldap_alloc, /* db_free */ krb5_ldap_free, /* optional functions */ diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h index 241037138..168abdfb6 100644 --- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h +++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h @@ -311,12 +311,6 @@ krb5_ldap_lock( krb5_context, int ); krb5_error_code krb5_ldap_unlock( krb5_context ); -const char * -krb5_ldap_errcode_2_string( krb5_context, long ); - -void -krb5_ldap_release_errcode_string (krb5_context, const char *); - #ifndef HAVE_LDAP_INITIALIZE int ldap_initialize(LDAP **, char *); diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c index 188645bf7..85c70761f 100644 --- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c +++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c @@ -1530,18 +1530,6 @@ krb5_ldap_unlock(krb5_context kcontext) return status; } -const char * -krb5_ldap_errcode_2_string(krb5_context kcontext, long err_code) -{ - return krb5_get_error_message(kcontext, err_code); -} - -void -krb5_ldap_release_errcode_string(krb5_context kcontext, const char *msg) -{ - krb5_free_error_message(kcontext, msg); -} - /* * Get the number of times an object has been referred to in a realm. this is -- cgit