X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=accept_sec_context.c;h=afbfb3f901ce25040d5bda81fbe7e642825dcce8;hb=refs%2Fheads%2Fddf-name;hp=5829ed9bda5f3f9653998e2b2a4526fac23ae539;hpb=ae79fdae047f980d01b2b4e84ccea52e24d8c7a0;p=mech_eap.orig

diff --git a/accept_sec_context.c b/accept_sec_context.c
index 5829ed9..afbfb3f 100644
--- a/accept_sec_context.c
+++ b/accept_sec_context.c
@@ -82,6 +82,7 @@ acceptReadyEap(OM_uint32 *minor, gss_ctx_id_t ctx, gss_cred_id_t cred)
     major = gssEapImportName(minor, &nameBuf,
                              (ctx->gssFlags & GSS_C_ANON_FLAG) ?
                                 GSS_C_NT_ANONYMOUS : GSS_C_NT_USER_NAME,
+                             ctx->mechanismUsed,
                              &ctx->initiatorName);
     if (GSS_ERROR(major))
         return major;
@@ -272,7 +273,7 @@ importInitiatorIdentity(OM_uint32 *minor,
     gssEapReleaseName(&tmpMinor, &ctx->initiatorName);
 
     return gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
-                            &ctx->initiatorName);
+                            ctx->mechanismUsed, &ctx->initiatorName);
 }
 
 /*
@@ -420,7 +421,7 @@ createRadiusHandle(OM_uint32 *minor,
     assert(actx->radContext == NULL);
     assert(actx->radConn == NULL);
 
-    if (rs_context_create(&actx->radContext, RS_DICT_FILE) != 0) {
+    if (rs_context_create(&actx->radContext) != 0) {
         *minor = GSSEAP_RADSEC_CONTEXT_FAILURE;
         return GSS_S_FAILURE;
     }
@@ -442,6 +443,11 @@ createRadiusHandle(OM_uint32 *minor,
         goto fail;
     }
 
+    if (rs_context_init_freeradius_dict(actx->radContext, NULL) != 0) {
+        err = rs_err_ctx_pop(actx->radContext);
+        goto fail;
+    }
+
     if (rs_conn_create(actx->radContext, &actx->radConn, configStanza) != 0) {
         err = rs_err_conn_pop(actx->radConn);
         goto fail;
@@ -870,8 +876,14 @@ gss_accept_sec_context(OM_uint32 *minor,
         goto cleanup;
 
     if (mech_type != NULL) {
-        if (!gssEapInternalizeOid(ctx->mechanismUsed, mech_type))
-            duplicateOid(&tmpMinor, ctx->mechanismUsed, mech_type);
+        OM_uint32 tmpMajor;
+
+        tmpMajor = gssEapCanonicalizeOid(&tmpMinor, ctx->mechanismUsed, 0, mech_type);
+        if (GSS_ERROR(tmpMajor)) {
+            major = tmpMajor;
+            *minor = tmpMinor;
+            goto cleanup;
+        }
     }
     if (ret_flags != NULL)
         *ret_flags = ctx->gssFlags;