diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-08-06 08:17:09 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-08-06 08:44:53 +1000 |
| commit | 64e2b859d2ed9c2428219617c3864c64cd6ed909 (patch) | |
| tree | 5bd71240e2facda348f3dc1dc843bd0b769c3e5f /source4/heimdal/lib/krb5 | |
| parent | b97d85c5e4db00a6cfc0a191907e88d2623c6681 (diff) | |
| download | samba-64e2b859d2ed9c2428219617c3864c64cd6ed909.tar.gz samba-64e2b859d2ed9c2428219617c3864c64cd6ed909.tar.bz2 samba-64e2b859d2ed9c2428219617c3864c64cd6ed909.zip | |
s4:heimdal: import lorikeet-heimdal-200908052208 (commit 370a73a74199a5a55188340906e15fd795f67a74)
This removes some of the portability changes made to code under
heimdal/
If these are still required, then we will re-add them with code under
heimdal_build/ (so that we can simply 'drop in' future heimdal
releases).
Andrew Bartlett
Diffstat (limited to 'source4/heimdal/lib/krb5')
| -rw-r--r-- | source4/heimdal/lib/krb5/context.c | 12 | ||||
| -rw-r--r-- | source4/heimdal/lib/krb5/krb5_locl.h | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/source4/heimdal/lib/krb5/context.c b/source4/heimdal/lib/krb5/context.c index fe94135030..9ece38e145 100644 --- a/source4/heimdal/lib/krb5/context.c +++ b/source4/heimdal/lib/krb5/context.c @@ -291,9 +291,7 @@ krb5_init_context(krb5_context *context) *context = NULL; /* should have a run_once */ -#if defined(HEIMDAL_LOCALEDIR) bindtextdomain(HEIMDAL_TEXTDOMAIN, HEIMDAL_LOCALEDIR); -#endif p = calloc(1, sizeof(*p)); if(!p) @@ -837,31 +835,21 @@ krb5_init_ets(krb5_context context) { if(context->et_list == NULL){ krb5_add_et_list(context, initialize_krb5_error_table_r); -#if defined(HEIMDAL_LOCALEDIR) bindtextdomain(COM_ERR_BINDDOMAIN_krb5, HEIMDAL_LOCALEDIR); -#endif krb5_add_et_list(context, initialize_asn1_error_table_r); -#if defined(HEIMDAL_LOCALEDIR) bindtextdomain(COM_ERR_BINDDOMAIN_asn1, HEIMDAL_LOCALEDIR); -#endif krb5_add_et_list(context, initialize_heim_error_table_r); -#if defined(HEIMDAL_LOCALEDIR) bindtextdomain(COM_ERR_BINDDOMAIN_heim, HEIMDAL_LOCALEDIR); -#endif krb5_add_et_list(context, initialize_k524_error_table_r); -#if defined(HEIMDAL_LOCALEDIR) bindtextdomain(COM_ERR_BINDDOMAIN_k524, HEIMDAL_LOCALEDIR); -#endif #ifdef PKINIT krb5_add_et_list(context, initialize_hx_error_table_r); -#if defined(HEIMDAL_LOCALEDIR) bindtextdomain(COM_ERR_BINDDOMAIN_hx, HEIMDAL_LOCALEDIR); #endif -#endif } } diff --git a/source4/heimdal/lib/krb5/krb5_locl.h b/source4/heimdal/lib/krb5/krb5_locl.h index 2d8bc07de3..b56219cced 100644 --- a/source4/heimdal/lib/krb5/krb5_locl.h +++ b/source4/heimdal/lib/krb5/krb5_locl.h @@ -116,7 +116,7 @@ struct sockaddr_dl; #define HEIMDAL_TEXTDOMAIN "heimdal_krb5" -#ifdef HAVE_LIBINTL_H +#ifdef LIBINTL #include <libintl.h> #define N_(x,y) dgettext(HEIMDAL_TEXTDOMAIN, x) #else |