svn rev #24590: trunk/src/lib/gssapi/krb5/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24590
Commit By: ghudson
Log Message:
ticket: 6675
target_version: 1.9.1
tags: pullup

Don't attempt to serialize a NULL authdata context when serializing a
GSSAPI context (most often seen with initiator contexts).  Patch from
aberry at likewise.com.



Changed Files:
U   trunk/src/lib/gssapi/krb5/ser_sctx.c
Modified: trunk/src/lib/gssapi/krb5/ser_sctx.c
===================================================================
--- trunk/src/lib/gssapi/krb5/ser_sctx.c	2010-12-28 17:27:15 UTC (rev 24589)
+++ trunk/src/lib/gssapi/krb5/ser_sctx.c	2010-12-28 18:27:17 UTC (rev 24590)
@@ -357,7 +357,7 @@
 
             initiator_name = ctx->initiate ? ctx->here : ctx->there;
 
-            if (initiator_name) {
+            if (initiator_name && initiator_name->ad_context) {
                 kret = krb5_size_opaque(kcontext,
                                         KV5M_AUTHDATA_CONTEXT,
                                         initiator_name->ad_context,
@@ -534,7 +534,7 @@
 
                 initiator_name = ctx->initiate ? ctx->here : ctx->there;
 
-                if (initiator_name) {
+                if (initiator_name && initiator_name->ad_context) {
                     kret = krb5_externalize_opaque(kcontext,
                                                    KV5M_AUTHDATA_CONTEXT,
                                                    initiator_name->ad_context,
@@ -775,6 +775,8 @@
                                                    (krb5_pointer *)&initiator_name->ad_context,
                                                    &bp,
                                                    &remain);
+                    if (kret == EINVAL)
+                        kret = 0;
                 }
             }
             /* Get trailer */