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 <leonardo.lists@gmail.com>.

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 9e5ba76d9f8fc2f5756705794c493299d36e8eb1..04200853c0a6f5dde0004a0cf0f5c3b8c2f813af 100644 (file)
--- 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);