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

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22790
Commit By: ghudson
Log Message:
Fix a few problems introduced by r22787.



Changed Files:
U   trunk/src/lib/krb5/krb/get_creds.c
U   trunk/src/lib/krb5/krb/int-proto.h
Modified: trunk/src/lib/krb5/krb/get_creds.c
===================================================================
--- trunk/src/lib/krb5/krb/get_creds.c	2009-09-25 16:57:22 UTC (rev 22789)
+++ trunk/src/lib/krb5/krb/get_creds.c	2009-09-28 01:47:32 UTC (rev 22790)
@@ -117,7 +117,8 @@
     krb5_error_code retval;
     krb5_creds mcreds, *ncreds, **tgts, **tgts_iter;
     krb5_flags fields;
-    int not_ktype, kdcopt = 0;
+    krb5_boolean not_ktype;
+    int kdcopt = 0;
 
     *out_creds = NULL;
 
@@ -147,17 +148,14 @@
 	    return 0;
 	}
 	free(ncreds);
+	ncreds = NULL;
 	if ((retval != KRB5_CC_NOTFOUND && retval != KRB5_CC_NOT_KTYPE)
 	    || options & KRB5_GC_CACHED)
 	    return retval;
+	not_ktype = (retval == KRB5_CC_NOT_KTYPE);
     } else if (options & KRB5_GC_CACHED)
 	return KRB5_CC_NOTFOUND;
 
-    if (retval == KRB5_CC_NOT_KTYPE)
-	not_ktype = 1;
-    else
-	not_ktype = 0;
-
     if (options & KRB5_GC_CANONICALIZE)
 	kdcopt |= KDC_OPT_CANONICALIZE;
     if (options & KRB5_GC_FORWARDABLE)

Modified: trunk/src/lib/krb5/krb/int-proto.h
===================================================================
--- trunk/src/lib/krb5/krb/int-proto.h	2009-09-25 16:57:22 UTC (rev 22789)
+++ trunk/src/lib/krb5/krb/int-proto.h	2009-09-28 01:47:32 UTC (rev 22790)
@@ -60,9 +60,9 @@
 			   krb5_creds ***tgts, int kdcopt);
 
 krb5_error_code
-krb5_construct_matching_creds(krb5_context context, krb5_flags options,
-			      krb5_creds *in_creds, krb5_creds *mcreds,
-			      krb5_flags *fields);
+krb5int_construct_matching_creds(krb5_context context, krb5_flags options,
+				 krb5_creds *in_creds, krb5_creds *mcreds,
+				 krb5_flags *fields);
 
 #define in_clock_skew(date, now) (labs((date)-(now)) < context->clockskew)