Change krbCred member to reauthCred to better clarify purpose

[moonshot.git] / mech_eap / util_reauth.c

diff --git a/mech_eap/util_reauth.c b/mech_eap/util_reauth.c
index 465bb16..a1d7251 100644 (file)
--- a/mech_eap/util_reauth.c
+++ b/mech_eap/util_reauth.c
@@ -454,7 +454,7 @@ getDefaultReauthCredentials(OM_uint32 *minor,
     ccache = NULL;
 
     major = gss_krb5_import_cred(minor, cred->krbCredCache, NULL, NULL,
-                                 &cred->krbCred);
+                                 &cred->reauthCred);
 
 cleanup:
     if (major == GSS_S_CRED_UNAVAIL)
@@ -572,7 +572,7 @@ gssEapStoreReauthCreds(OM_uint32 *minor,
             krb5_cc_destroy(krbContext, cred->krbCredCache);
             cred->krbCredCache = NULL;
         }
-        gssReleaseCred(minor, &cred->krbCred);
+        gssReleaseCred(minor, &cred->reauthCred);
     }
 
     if (cred->krbCredCache == NULL) {
@@ -607,7 +607,7 @@ gssEapStoreReauthCreds(OM_uint32 *minor,
     }
 
     major = gss_krb5_import_cred(minor, cred->krbCredCache, NULL, NULL,
-                                 &cred->krbCred);
+                                 &cred->reauthCred);
     if (GSS_ERROR(major))
         goto cleanup;
 
@@ -739,7 +739,7 @@ gssEapGlueToMechName(OM_uint32 *minor,
 
     major = defrostAttrContext(minor,
 #ifdef HAVE_HEIMDAL_VERSION
-                               ctx->kerberosCtx,
+                               ctx->reauthCtx,
 #else
                                glueName,
 #endif
@@ -815,11 +815,11 @@ gssEapReauthComplete(OM_uint32 *minor,
     /* Get the raw subsession key and encryption type */
 #ifdef HAVE_HEIMDAL_VERSION
 #define KRB_GSS_SUBKEY_COUNT    1 /* encoded session key */
-    major = gssInquireSecContextByOid(minor, ctx->kerberosCtx,
+    major = gssInquireSecContextByOid(minor, ctx->reauthCtx,
                                       GSS_KRB5_GET_SUBKEY_X, &keyData);
 #else
 #define KRB_GSS_SUBKEY_COUNT    2 /* raw session key, enctype OID */
-    major = gssInquireSecContextByOid(minor, ctx->kerberosCtx,
+    major = gssInquireSecContextByOid(minor, ctx->reauthCtx,
                                       GSS_C_INQ_SSPI_SESSION_KEY, &keyData);
 #endif
     if (GSS_ERROR(major))