From: Tom Yu <tlyu@mit.edu>
Date: Wed, 19 May 2010 18:52:32 +0000 (+0000)
Subject: pull up r23925 from trunk
X-Git-Tag: krb5-1.8.2-beta1~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3401907d2433bb23762edfc453b6da965fcef18a;p=thirdparty%2Fkrb5.git

pull up r23925 from trunk

 ------------------------------------------------------------------------
 r23925 | tlyu | 2010-04-22 16:04:01 -0400 (Thu, 22 Apr 2010) | 8 lines

 ticket: 6696
 target_version: 1.8.2
 tags: pullup

 Apply patch from Arlene Berry to cease freeing error tokens output by
 accept_sec_context, allowing them to actually be sent to the
 initiator.

ticket: 6696
version_fixed: 1.8.2
status: resolved

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

diff --git a/src/lib/gssapi/mechglue/g_accept_sec_context.c b/src/lib/gssapi/mechglue/g_accept_sec_context.c
index b4b152551c..498bfc4569 100644
--- a/src/lib/gssapi/mechglue/g_accept_sec_context.c
+++ b/src/lib/gssapi/mechglue/g_accept_sec_context.c
@@ -356,9 +356,6 @@ error_out:
 	free(union_ctx_id);
     }
 
-    if (output_token->length)
-	(void) gss_release_buffer(&temp_minor_status, output_token);
-
     if (src_name)
 	*src_name = GSS_C_NO_NAME;