for now, allow default GSS EAP realm to be set

[mech_eap.orig] / util_reauth.c

diff --git a/util_reauth.c b/util_reauth.c
index a03f285..22f089f 100644 (file)
--- a/util_reauth.c
+++ b/util_reauth.c
@@ -375,7 +375,7 @@ cleanup:
 }
 
 static int
-isTicketGrantingServiceP(krb5_context krbContext,
+isTicketGrantingServiceP(krb5_context krbContext GSSEAP_UNUSED,
                          krb5_const_principal principal)
 {
     if (KRB_PRINC_LENGTH(principal) == 2 &&
@@ -652,7 +652,11 @@ static gss_buffer_desc radiusAvpKrbAttr = {
  */
 static OM_uint32
 defrostAttrContext(OM_uint32 *minor,
+#ifdef HAVE_HEIMDAL_VERSION
                    gss_ctx_id_t glueContext,
+#else
+                   gss_ctx_id_t glueContext GSSEAP_UNUSED,
+#endif
                    gss_name_t glueName,
                    gss_name_t mechName)
 {
@@ -717,7 +721,7 @@ defrostAttrContext(OM_uint32 *minor,
  */
 OM_uint32
 gssEapGlueToMechName(OM_uint32 *minor,
-                     gss_ctx_id_t glueContext,
+                     gss_ctx_id_t ctx,
                      gss_name_t glueName,
                      gss_name_t *pMechName)
 {
@@ -731,11 +735,11 @@ gssEapGlueToMechName(OM_uint32 *minor,
         goto cleanup;
 
     major = gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
-                             pMechName);
+                             ctx->mechanismUsed, pMechName);
     if (GSS_ERROR(major))
         goto cleanup;
 
-    major = defrostAttrContext(minor, glueContext, glueName, *pMechName);
+    major = defrostAttrContext(minor, ctx->kerberosCtx, glueName, *pMechName);
     if (GSS_ERROR(major))
         goto cleanup;
 
@@ -786,7 +790,7 @@ cleanup:
 OM_uint32
 gssEapReauthComplete(OM_uint32 *minor,
                      gss_ctx_id_t ctx,
-                     gss_cred_id_t cred,
+                     gss_cred_id_t cred GSSEAP_UNUSED,
                      const gss_OID mech,
                      OM_uint32 timeRec)
 {