From: Greg Hudson <ghudson@mit.edu>
Date: Fri, 10 Apr 2009 21:17:03 +0000 (+0000)
Subject: In krb5_get_in_tkt, r7002 introduced an unused local variable
X-Git-Tag: krb5-1.8-alpha1~548
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bff1d19a1ae6a81dd5885c2d72658e0f0c89d19e;p=krb5.git

In krb5_get_in_tkt, r7002 introduced an unused local variable
"padata".  It was accidentally used in r18641 instead of
preauth_to_use when sorting the received padata sequence, causing the
sort to be a no-op.  Sort the correct sequence and eliminate the
unused local variable.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22193 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/krb/get_in_tkt.c b/src/lib/krb5/krb/get_in_tkt.c
index e6c4434c2..5acc19aa5 100644
--- a/src/lib/krb5/krb/get_in_tkt.c
+++ b/src/lib/krb5/krb/get_in_tkt.c
@@ -512,7 +512,6 @@ krb5_get_in_tkt(krb5_context context,
     krb5_keyblock *	decrypt_key = 0;
     krb5_kdc_req	request;
     krb5_data *encoded_request;
-    krb5_pa_data	**padata = 0;
     krb5_error *	err_reply;
     krb5_kdc_rep *	as_reply = 0;
     krb5_pa_data  **	preauth_to_use = 0;
@@ -664,7 +663,7 @@ krb5_get_in_tkt(krb5_context context,
 		    goto cleanup;
                 retval = sort_krb5_padata_sequence(context,
 						   &request.server->realm,
-						   padata);
+						   preauth_to_use);
 		if (retval)
 		    goto cleanup;
 		continue;
@@ -728,8 +727,6 @@ cleanup:
 	krb5_free_addresses(context, request.addresses);
     if (request.padata)
 	krb5_free_pa_data(context, request.padata);
-    if (padata)
-	krb5_free_pa_data(context, padata);
     if (preauth_to_use)
 	krb5_free_pa_data(context, preauth_to_use);
     if (decrypt_key)