check for non-NULL before calling pairbasicfree()

[mech_eap.orig] / accept_sec_context.c

diff --git a/accept_sec_context.c b/accept_sec_context.c
index 5b3d53f..129fd64 100644 (file)
--- a/accept_sec_context.c
+++ b/accept_sec_context.c
@@ -124,6 +124,28 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred)
     return GSS_S_COMPLETE;
 }
 
+#ifdef GSSEAP_DEBUG
+static OM_uint32
+eapGssSmAcceptVendorInfo(OM_uint32 *minor,
+                         gss_cred_id_t cred,
+                         gss_ctx_id_t ctx,
+                         gss_name_t target,
+                         gss_OID mech,
+                         OM_uint32 reqFlags,
+                         OM_uint32 timeReq,
+                         gss_channel_bindings_t chanBindings,
+                         gss_buffer_t inputToken,
+                         gss_buffer_t outputToken,
+                         OM_uint32 *smFlags)
+{
+    fprintf(stderr, "GSS-EAP: vendor %.*s\n",
+            (int)inputToken->length, (char *)inputToken->value);
+
+    return GSS_S_CONTINUE_NEEDED;
+}
+#endif
+
+
 /*
  * Emit a identity EAP request to force the initiator (peer) to identify
  * itself.
@@ -617,8 +639,10 @@ eapGssSmAcceptReauthCreds(OM_uint32 *minor,
      * fabricate a ticket from the initiator to ourselves.
      */
     major = gssEapMakeReauthCreds(minor, ctx, cred, outputToken);
-    if (GSS_ERROR(major))
-        return major;
+    if (major == GSS_S_UNAVAILABLE)
+        major = GSS_S_COMPLETE;
+    if (major == GSS_S_COMPLETE)
+        major = GSS_S_CONTINUE_NEEDED;
 
     return major;
 }
@@ -666,6 +690,15 @@ eapGssSmAcceptCompleteAcceptorExts(OM_uint32 *minor,
 }
 
 static struct gss_eap_sm eapGssAcceptorSm[] = {
+#ifdef GSSEAP_DEBUG
+    {
+        ITOK_TYPE_VENDOR_INFO,
+        ITOK_TYPE_NONE,
+        GSSEAP_STATE_INITIAL,
+        0,
+        eapGssSmAcceptVendorInfo,
+    },
+#endif
 #ifdef GSSEAP_ENABLE_REAUTH
     {
         ITOK_TYPE_REAUTH_REQ,