Revert "Don't include @ symbol in realmless names, to conform with draft-ietf-abfab...

[mech_eap.orig] / inquire_context.c

diff --git a/inquire_context.c b/inquire_context.c
index ab0e4d3..0e7b586 100644 (file)
--- a/inquire_context.c
+++ b/inquire_context.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Return context handle properties.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32
@@ -47,11 +51,9 @@ gss_inquire_context(OM_uint32 *minor,
 
     if (ctx == GSS_C_NO_CONTEXT) {
         *minor = EINVAL;
-        return GSS_S_NO_CONTEXT;
+        return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_NO_CONTEXT;
     }
 
-    *minor = 0;
-
     GSSEAP_MUTEX_LOCK(&ctx->mutex);
 
     if (src_name != NULL) {
@@ -82,11 +84,9 @@ gss_inquire_context(OM_uint32 *minor,
     }
 
     if (mech_type != NULL) {
-        if (!gssEapInternalizeOid(ctx->mechanismUsed, mech_type)) {
-            major = duplicateOid(minor, ctx->mechanismUsed, mech_type);
-            if (GSS_ERROR(major))
-                goto cleanup;
-        }
+        major = gssEapCanonicalizeOid(minor, ctx->mechanismUsed, 0, mech_type);
+        if (GSS_ERROR(major))
+            goto cleanup;
     }
 
     if (ctx_flags != NULL) {
@@ -102,6 +102,7 @@ gss_inquire_context(OM_uint32 *minor,
     }
 
     major = GSS_S_COMPLETE;
+    *minor = 0;
 
 cleanup:
     GSSEAP_MUTEX_UNLOCK(&ctx->mutex);