summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/gssapi/gss_libinit.c6
-rw-r--r--src/lib/krb5/krb5_libinit.c5
2 files changed, 3 insertions, 8 deletions
diff --git a/src/lib/gssapi/gss_libinit.c b/src/lib/gssapi/gss_libinit.c
index 3c26c98cd..cdffb7729 100644
--- a/src/lib/gssapi/gss_libinit.c
+++ b/src/lib/gssapi/gss_libinit.c
@@ -25,10 +25,9 @@ int gssint_lib_init(void)
printf("gssint_lib_init\n");
#endif
-#if !USE_BUNDLE_ERROR_STRINGS
add_error_table(&et_k5g_error_table);
add_error_table(&et_ggss_error_table);
-#endif
+
err = gssint_mechglue_init();
if (err)
return err;
@@ -69,10 +68,9 @@ void gssint_lib_fini(void)
#ifdef SHOW_INITFINI_FUNCS
printf("gssint_lib_fini\n");
#endif
-#if !USE_BUNDLE_ERROR_STRINGS
remove_error_table(&et_k5g_error_table);
remove_error_table(&et_ggss_error_table);
-#endif
+
k5_key_delete(K5_KEY_GSS_KRB5_SET_CCACHE_OLD_NAME);
k5_key_delete(K5_KEY_GSS_KRB5_CCACHE_NAME);
k5_mutex_destroy(&kg_vdb.mutex);
diff --git a/src/lib/krb5/krb5_libinit.c b/src/lib/krb5/krb5_libinit.c
index 94187781c..c154da81b 100644
--- a/src/lib/krb5/krb5_libinit.c
+++ b/src/lib/krb5/krb5_libinit.c
@@ -33,13 +33,11 @@ int krb5int_lib_init(void)
printf("krb5int_lib_init\n");
#endif
-#if !USE_BUNDLE_ERROR_STRINGS
add_error_table(&et_krb5_error_table);
add_error_table(&et_kv5m_error_table);
add_error_table(&et_kdb5_error_table);
add_error_table(&et_asn1_error_table);
add_error_table(&et_k524_error_table);
-#endif
err = krb5int_rc_finish_init();
if (err)
@@ -94,13 +92,12 @@ void krb5int_lib_fini(void)
krb5_stdcc_shutdown();
#endif
-#if !USE_BUNDLE_ERROR_STRINGS
remove_error_table(&et_krb5_error_table);
remove_error_table(&et_kv5m_error_table);
remove_error_table(&et_kdb5_error_table);
remove_error_table(&et_asn1_error_table);
remove_error_table(&et_k524_error_table);
-#endif
+
krb5int_set_error_info_callout_fn (0);
}