remove util_alloc.c

[mech_eap.git] / inquire_context.c

diff --git a/inquire_context.c b/inquire_context.c
index abe6c62..ab0e4d3 100644 (file)
--- a/inquire_context.c
+++ b/inquire_context.c
@@ -45,21 +45,23 @@ gss_inquire_context(OM_uint32 *minor,
 {
     OM_uint32 major, tmpMinor;
 
-    *minor = 0;
-
     if (ctx == GSS_C_NO_CONTEXT) {
-        major = GSS_S_NO_CONTEXT;
-        goto cleanup;
+        *minor = EINVAL;
+        return GSS_S_NO_CONTEXT;
     }
 
+    *minor = 0;
+
+    GSSEAP_MUTEX_LOCK(&ctx->mutex);
+
     if (src_name != NULL) {
-        major = gss_duplicate_name(minor, ctx->initiatorName, src_name);
+        major = gssEapDuplicateName(minor, ctx->initiatorName, src_name);
         if (GSS_ERROR(major))
             goto cleanup;
     }
 
     if (targ_name != NULL) {
-        major = gss_duplicate_name(minor, ctx->acceptorName, targ_name);
+        major = gssEapDuplicateName(minor, ctx->acceptorName, targ_name);
         if (GSS_ERROR(major))
             goto cleanup;
     }
@@ -79,6 +81,14 @@ gss_inquire_context(OM_uint32 *minor,
         *lifetime_rec = lifetime;
     }
 
+    if (mech_type != NULL) {
+        if (!gssEapInternalizeOid(ctx->mechanismUsed, mech_type)) {
+            major = duplicateOid(minor, ctx->mechanismUsed, mech_type);
+            if (GSS_ERROR(major))
+                goto cleanup;
+        }
+    }
+
     if (ctx_flags != NULL) {
         *ctx_flags = ctx->gssFlags;
     }
@@ -94,6 +104,8 @@ gss_inquire_context(OM_uint32 *minor,
     major = GSS_S_COMPLETE;
 
 cleanup:
+    GSSEAP_MUTEX_UNLOCK(&ctx->mutex);
+
     if (GSS_ERROR(major)) {
         gssEapReleaseName(&tmpMinor, src_name);
         gssEapReleaseName(&tmpMinor, targ_name);