From 13ba2956cc2a8c1c1f681586b05a96679a57334e Mon Sep 17 00:00:00 2001 From: Love Hornquist Astrand Date: Wed, 26 Aug 2009 09:02:25 -0700 Subject: [PATCH] Check if COM_ERR_BINDDOMAIN_krb5 is defined, if it is, use bindtextdomain() Older versions of compile_et doesn't support gettext/libintl support, if they don't, there will be no such symbols and we can't load the text domains for those symbols, so lets skip that. Pointed out by Guillaume Rousse on heimdal-discuss --- lib/krb5/context.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/krb5/context.c b/lib/krb5/context.c index 1311f122f..184346a07 100644 --- a/lib/krb5/context.c +++ b/lib/krb5/context.c @@ -838,20 +838,23 @@ krb5_init_ets(krb5_context context) { if(context->et_list == NULL){ krb5_add_et_list(context, initialize_krb5_error_table_r); - bindtextdomain(COM_ERR_BINDDOMAIN_krb5, HEIMDAL_LOCALEDIR); - krb5_add_et_list(context, initialize_asn1_error_table_r); - bindtextdomain(COM_ERR_BINDDOMAIN_asn1, HEIMDAL_LOCALEDIR); - krb5_add_et_list(context, initialize_heim_error_table_r); - bindtextdomain(COM_ERR_BINDDOMAIN_heim, HEIMDAL_LOCALEDIR); krb5_add_et_list(context, initialize_k524_error_table_r); + +#ifdef COM_ERR_BINDDOMAIN_krb5 + bindtextdomain(COM_ERR_BINDDOMAIN_krb5, HEIMDAL_LOCALEDIR); + bindtextdomain(COM_ERR_BINDDOMAIN_asn1, HEIMDAL_LOCALEDIR); + bindtextdomain(COM_ERR_BINDDOMAIN_heim, HEIMDAL_LOCALEDIR); bindtextdomain(COM_ERR_BINDDOMAIN_k524, HEIMDAL_LOCALEDIR); +#endif #ifdef PKINIT krb5_add_et_list(context, initialize_hx_error_table_r); +#ifdef COM_ERR_BINDDOMAIN_hx bindtextdomain(COM_ERR_BINDDOMAIN_hx, HEIMDAL_LOCALEDIR); +#endif #endif } }