svn rev #22780: trunk/src/lib/ gssapi/mechglue/ krb5/krb/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22780
Commit By: ghudson
Log Message:
ticket: 6563

Fix a few bugs in r22736.  Cherry-picked from Luke's authdata branch.



Changed Files:
U   trunk/src/lib/gssapi/mechglue/g_set_context_option.c
U   trunk/src/lib/krb5/krb/s4u_creds.c
Modified: trunk/src/lib/gssapi/mechglue/g_set_context_option.c
===================================================================
--- trunk/src/lib/gssapi/mechglue/g_set_context_option.c	2009-09-20 22:23:52 UTC (rev 22779)
+++ trunk/src/lib/gssapi/mechglue/g_set_context_option.c	2009-09-21 15:53:47 UTC (rev 22780)
@@ -81,7 +81,7 @@
 	    if (ctx == NULL) {
 		*minor_status = ENOMEM;
 		gssint_delete_internal_sec_context(&minor,
-						   ctx->mech_type,
+						   &mech->mech_type,
 						   &internal_ctx,
 						   GSS_C_NO_BUFFER);
 		return GSS_S_FAILURE;

Modified: trunk/src/lib/krb5/krb/s4u_creds.c
===================================================================
--- trunk/src/lib/krb5/krb/s4u_creds.c	2009-09-20 22:23:52 UTC (rev 22779)
+++ trunk/src/lib/krb5/krb/s4u_creds.c	2009-09-21 15:53:47 UTC (rev 22780)
@@ -207,10 +207,8 @@
     krb5_data *for_user_data = NULL;
     char package[] = "Kerberos";
 
-    if (userid->user == NULL) {
-        code = EINVAL;
-        goto cleanup;
-    }
+    if (userid->user == NULL)
+        return EINVAL;
 
     memset(&for_user, 0, sizeof(for_user));
     for_user.user = userid->user;
@@ -580,8 +578,10 @@
         code = krb5int_copy_data_contents(context,
                                           &tgtptr->server->data[1],
                                           &s4u_creds.server->realm);
-        if (code != 0)
+        if (code != 0) {
+            krb5_free_pa_data(context, in_padata);
             goto cleanup;
+        }
 
         code = krb5_get_cred_via_tkt_ext(context, tgtptr,
                                          KDC_OPT_CANONICALIZE |