svn rev #22170: trunk/src/ kdc/ lib/krb5/krb/

[hartmans@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22170
Commit By: hartmans
Log Message:
ticket: 6436

fix logic errors


Changed Files:
U   trunk/src/kdc/fast_util.c
U   trunk/src/lib/krb5/krb/get_in_tkt.c
Modified: trunk/src/kdc/fast_util.c
===================================================================
--- trunk/src/kdc/fast_util.c	2009-04-03 18:14:40 UTC (rev 22169)
+++ trunk/src/kdc/fast_util.c	2009-04-04 03:03:04 UTC (rev 22170)
@@ -211,7 +211,7 @@
     else cookie_padata = find_pa_data(request->padata, KRB5_PADATA_FX_COOKIE);
         if (retval == 0 && cookie_padata != NULL) {
 	krb5_pa_data *new_padata = malloc(sizeof (krb5_pa_data));
-	if (new_padata != NULL) {
+	if (new_padata == NULL) {
 	    retval = ENOMEM;
 	} else {
 	    new_padata->pa_type = KRB5_PADATA_FX_COOKIE;

Modified: trunk/src/lib/krb5/krb/get_in_tkt.c
===================================================================
--- trunk/src/lib/krb5/krb/get_in_tkt.c	2009-04-03 18:14:40 UTC (rev 22169)
+++ trunk/src/lib/krb5/krb/get_in_tkt.c	2009-04-04 03:03:04 UTC (rev 22170)
@@ -1472,7 +1472,7 @@
 	if (ret)
 	  goto cleanup;
 	if ((ret = decrypt_as_reply(context, NULL, local_as_reply, NULL,
-				    NULL, &as_key, krb5_kdc_rep_decrypt_proc,
+				    NULL, &encrypting_key, krb5_kdc_rep_decrypt_proc,
 				    NULL)))
 	    goto cleanup;
     }