From 70aabaea618f8dc42336a8f27e6443b3f2655830 Mon Sep 17 00:00:00 2001
From: Luke Howard <lukeh@padl.com>
Date: Fri, 22 Apr 2011 12:58:20 +0200
Subject: [PATCH] Change krbCred member to reauthCred to better clarify purpose

---
 mech_eap/accept_sec_context.c | 2 +-
 mech_eap/gssapiP_eap.h        | 2 +-
 mech_eap/init_sec_context.c   | 2 +-
 mech_eap/store_cred.c         | 4 ++--
 mech_eap/util_cred.c          | 4 ++--
 mech_eap/util_reauth.c        | 6 +++---
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mech_eap/accept_sec_context.c b/mech_eap/accept_sec_context.c
index 6776047..cc8702d 100644
--- a/mech_eap/accept_sec_context.c
+++ b/mech_eap/accept_sec_context.c
@@ -972,7 +972,7 @@ eapGssSmAcceptGssReauth(OM_uint32 *minor,
 
     major = gssAcceptSecContext(minor,
                                 &ctx->reauthCtx,
-                                cred->krbCred,
+                                cred->reauthCred,
                                 inputToken,
                                 chanBindings,
                                 &krbInitiator,
diff --git a/mech_eap/gssapiP_eap.h b/mech_eap/gssapiP_eap.h
index 89a0d8c..d1d6bce 100644
--- a/mech_eap/gssapiP_eap.h
+++ b/mech_eap/gssapiP_eap.h
@@ -135,7 +135,7 @@ struct gss_cred_id_struct
     char *radiusConfigStanza;
 #ifdef GSSEAP_ENABLE_REAUTH
     krb5_ccache krbCredCache;
-    gss_cred_id_t krbCred;
+    gss_cred_id_t reauthCred;
 #endif
 };
 
diff --git a/mech_eap/init_sec_context.c b/mech_eap/init_sec_context.c
index 2e4b23b..930eb32 100644
--- a/mech_eap/init_sec_context.c
+++ b/mech_eap/init_sec_context.c
@@ -471,7 +471,7 @@ eapGssSmInitGssReauth(OM_uint32 *minor,
         goto cleanup;
 
     major = gssInitSecContext(minor,
-                              cred->krbCred,
+                              cred->reauthCred,
                               &ctx->reauthCtx,
                               mechTarget,
                               (gss_OID)gss_mech_krb5,
diff --git a/mech_eap/store_cred.c b/mech_eap/store_cred.c
index c294841..2847f42 100644
--- a/mech_eap/store_cred.c
+++ b/mech_eap/store_cred.c
@@ -65,9 +65,9 @@ gss_store_cred(OM_uint32 *minor,
     *minor = 0;
 
 #ifdef GSSEAP_ENABLE_REAUTH
-    if (cred->krbCred != GSS_C_NO_CREDENTIAL) {
+    if (cred->reauthCred != GSS_C_NO_CREDENTIAL) {
         major = gssStoreCred(minor,
-                             cred->krbCred,
+                             cred->reauthCred,
                              input_usage,
                              (gss_OID)gss_mech_krb5,
                              overwrite_cred,
diff --git a/mech_eap/util_cred.c b/mech_eap/util_cred.c
index 1cabdcf..1d49e56 100644
--- a/mech_eap/util_cred.c
+++ b/mech_eap/util_cred.c
@@ -96,8 +96,8 @@ gssEapReleaseCred(OM_uint32 *minor, gss_cred_id_t *pCred)
         else
             krb5_cc_destroy(krbContext, cred->krbCredCache);
     }
-    if (cred->krbCred != GSS_C_NO_CREDENTIAL)
-        gssReleaseCred(&tmpMinor, &cred->krbCred);
+    if (cred->reauthCred != GSS_C_NO_CREDENTIAL)
+        gssReleaseCred(&tmpMinor, &cred->reauthCred);
 #endif
 
     GSSEAP_MUTEX_DESTROY(&cred->mutex);
diff --git a/mech_eap/util_reauth.c b/mech_eap/util_reauth.c
index 6c66570..a1d7251 100644
--- 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;
 
-- 
2.1.4