pull up r24917 from trunk

 ------------------------------------------------------------------------
 r24917 | ghudson | 2011-05-09 13:28:07 -0400 (Mon, 09 May 2011) | 10 lines

 ticket: 6908
 subject: Delete sec context properly in gss_krb5_export_lucid_sec_context
 target_version: 1.9.2
 tags: pullup

 Since r21690, gss_krb5_export_lucid_sec_context() has been passing a
 union context to krb5_gss_delete_sec_context(), causing a crash as the
 krb5 routine attempts to interpret a union context structure as a krb5
 GSS context.  Call the mechglue gss_delete_sec_context instead.

ticket: 6908
version_fixed: 1.9.2
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-9@24953 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/krb5/krb5_gss_glue.c b/src/lib/gssapi/krb5/krb5_gss_glue.c
index bc3b7c7f921fa63e22ffae61b217cb5d6da22ed7..0035d4fb02bde5e2992550a7ce57902644efee38 100644 (file)
--- a/src/lib/gssapi/krb5/krb5_gss_glue.c
+++ b/src/lib/gssapi/krb5/krb5_gss_glue.c
@@ -196,7 +196,7 @@ gss_krb5_export_lucid_sec_context(OM_uint32 *minor_status,
     /* Clean up the context state (it is an error for
      * someone to attempt to use this context again)
      */
-    (void)krb5_gss_delete_sec_context(minor_status, context_handle, NULL);
+    (void)gss_delete_sec_context(minor_status, context_handle, NULL);
     *context_handle = GSS_C_NO_CONTEXT;
 
     generic_gss_release_buffer_set(&minor, &data_set);