Cleanup provider immediately if initialisation fails

[mech_eap.orig] / util_context.c

diff --git a/util_context.c b/util_context.c
index 6ff5121..13372ea 100644 (file)
--- a/util_context.c
+++ b/util_context.c
@@ -74,16 +74,19 @@ gssEapAllocContext(OM_uint32 *minor,
 }
 
 static void
-releaseInitiatorContext(struct eap_gss_initiator_ctx *ctx)
+releaseInitiatorContext(struct gss_eap_initiator_ctx *ctx)
 {
     eap_peer_sm_deinit(ctx->eap);
 }
 
 static void
-releaseAcceptorContext(struct eap_gss_acceptor_ctx *ctx)
+releaseAcceptorContext(struct gss_eap_acceptor_ctx *ctx)
 {
+#ifdef BUILTIN_EAP
     eap_server_sm_deinit(ctx->eap);
-    tls_deinit(ctx->tlsContext);
+    if (ctx->tlsContext != NULL)
+        tls_deinit(ctx->tlsContext);
+#endif
 }
 
 OM_uint32
@@ -110,7 +113,7 @@ gssEapReleaseContext(OM_uint32 *minor,
     gssEapReleaseName(&tmpMinor, &ctx->initiatorName);
     gssEapReleaseName(&tmpMinor, &ctx->acceptorName);
     gss_release_oid(&tmpMinor, &ctx->mechanismUsed);
-    sequenceFree(&ctx->seqState);
+    sequenceFree(&tmpMinor, &ctx->seqState);
 
     GSSEAP_MUTEX_DESTROY(&ctx->mutex);