svn rev #22193: trunk/src/lib/krb5/krb/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22193
Commit By: ghudson
Log Message:
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.



Changed Files:
U   trunk/src/lib/krb5/krb/get_in_tkt.c
Modified: trunk/src/lib/krb5/krb/get_in_tkt.c
===================================================================
--- trunk/src/lib/krb5/krb/get_in_tkt.c	2009-04-10 20:17:38 UTC (rev 22192)
+++ trunk/src/lib/krb5/krb/get_in_tkt.c	2009-04-10 21:17:03 UTC (rev 22193)
@@ -512,7 +512,6 @@
     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 @@
 		    goto cleanup;
                 retval = sort_krb5_padata_sequence(context,
 						   &request.server->realm,
-						   padata);
+						   preauth_to_use);
 		if (retval)
 		    goto cleanup;
 		continue;
@@ -728,8 +727,6 @@
 	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)