From: Tom Yu Date: Tue, 20 Jul 2010 22:28:44 +0000 (+0000) Subject: pull up r24139 from trunk X-Git-Tag: krb5-1.8.3-beta1~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfbd563ba78ae590427599086cb8cc135face97a;p=thirdparty%2Fkrb5.git pull up r24139 from trunk ------------------------------------------------------------------------ r24139 | ghudson | 2010-06-21 11:18:37 -0400 (Mon, 21 Jun 2010) | 12 lines ticket: 6745 subject: Add correct error table when initializing gss-krb5 target_version: 1.8.3 tags: pullup gss_krb5int_lib_init was adding the generic GSS error table (again) instead of the krb5 error table, which could lead to crashes on library unload. This bug was introduced in krb5 1.7; the fix is also applicable there. Patch from Leonardo Chiquitto . ticket: 6745 version_fixed: 1.8.3 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@24196 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c index 9e5ba76d9f..04200853c0 100644 --- a/src/lib/gssapi/krb5/gssapi_krb5.c +++ b/src/lib/gssapi/krb5/gssapi_krb5.c @@ -740,7 +740,7 @@ int gss_krb5int_lib_init(void) printf("gss_krb5int_lib_init\n"); #endif - add_error_table(&et_ggss_error_table); + add_error_table(&et_k5g_error_table); #ifndef LEAN_CLIENT err = k5_mutex_finish_init(&gssint_krb5_keytab_lock);