s/kerberosCtx/reauthCtx/g

diff --git a/mech_eap/accept_sec_context.c b/mech_eap/accept_sec_context.c
index ca95f5c..6776047 100644 (file)
--- a/mech_eap/accept_sec_context.c
+++ b/mech_eap/accept_sec_context.c
@@ -971,7 +971,7 @@ eapGssSmAcceptGssReauth(OM_uint32 *minor,
     ctx->flags |= CTX_FLAG_KRB_REAUTH;
 
     major = gssAcceptSecContext(minor,
     ctx->flags |= CTX_FLAG_KRB_REAUTH;
 
     major = gssAcceptSecContext(minor,

-                                &ctx->kerberosCtx,
+                                &ctx->reauthCtx,

                                 cred->krbCred,
                                 inputToken,
                                 chanBindings,
                                 cred->krbCred,
                                 inputToken,
                                 chanBindings,


@@ -991,7 +991,7 @@ eapGssSmAcceptGssReauth(OM_uint32 *minor,
     } else if (GSS_ERROR(major) &&
         (*smFlags & SM_FLAG_INPUT_TOKEN_CRITICAL) == 0) {
         /* pretend reauthentication attempt never happened */
     } else if (GSS_ERROR(major) &&
         (*smFlags & SM_FLAG_INPUT_TOKEN_CRITICAL) == 0) {
         /* pretend reauthentication attempt never happened */

-        gssDeleteSecContext(&tmpMinor, &ctx->kerberosCtx, GSS_C_NO_BUFFER);
+        gssDeleteSecContext(&tmpMinor, &ctx->reauthCtx, GSS_C_NO_BUFFER);

         ctx->flags &= ~(CTX_FLAG_KRB_REAUTH);
         GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_INITIAL);
         major = GSS_S_CONTINUE_NEEDED;
         ctx->flags &= ~(CTX_FLAG_KRB_REAUTH);
         GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_INITIAL);
         major = GSS_S_CONTINUE_NEEDED;

diff --git a/mech_eap/gssapiP_eap.h b/mech_eap/gssapiP_eap.h
index a45ebd5..fbaca89 100644 (file)
--- a/mech_eap/gssapiP_eap.h
+++ b/mech_eap/gssapiP_eap.h
@@ -201,8 +201,8 @@ struct gss_ctx_id_struct
         struct gss_eap_acceptor_ctx  acceptor;
         #define acceptorCtx          ctxU.acceptor
 #ifdef GSSEAP_ENABLE_REAUTH
         struct gss_eap_acceptor_ctx  acceptor;
         #define acceptorCtx          ctxU.acceptor
 #ifdef GSSEAP_ENABLE_REAUTH

-        gss_ctx_id_t                 kerberos;
-        #define kerberosCtx          ctxU.kerberos
+        gss_ctx_id_t                 reauth;
+        #define reauthCtx            ctxU.reauth

 #endif
     } ctxU;
 };
 #endif
     } ctxU;
 };

diff --git a/mech_eap/init_sec_context.c b/mech_eap/init_sec_context.c
index 3194f99..2e4b23b 100644 (file)
--- a/mech_eap/init_sec_context.c
+++ b/mech_eap/init_sec_context.c
@@ -472,7 +472,7 @@ eapGssSmInitGssReauth(OM_uint32 *minor,
 
     major = gssInitSecContext(minor,
                               cred->krbCred,
 
     major = gssInitSecContext(minor,
                               cred->krbCred,

-                              &ctx->kerberosCtx,
+                              &ctx->reauthCtx,

                               mechTarget,
                               (gss_OID)gss_mech_krb5,
                               reqFlags | GSS_C_MUTUAL_FLAG,
                               mechTarget,
                               (gss_OID)gss_mech_krb5,
                               reqFlags | GSS_C_MUTUAL_FLAG,


@@ -596,7 +596,7 @@ eapGssSmInitIdentity(OM_uint32 *minor,
         OM_uint32 tmpMinor;
 
         /* server didn't support reauthentication, sent EAP request */
         OM_uint32 tmpMinor;
 
         /* server didn't support reauthentication, sent EAP request */

-        gssDeleteSecContext(&tmpMinor, &ctx->kerberosCtx, GSS_C_NO_BUFFER);
+        gssDeleteSecContext(&tmpMinor, &ctx->reauthCtx, GSS_C_NO_BUFFER);

         ctx->flags &= ~(CTX_FLAG_KRB_REAUTH);
         GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_INITIAL);
     } else
         ctx->flags &= ~(CTX_FLAG_KRB_REAUTH);
         GSSEAP_SM_TRANSITION(ctx, GSSEAP_STATE_INITIAL);
     } else

diff --git a/mech_eap/util_context.c b/mech_eap/util_context.c
index 0396e26..e9a9308 100644 (file)
--- a/mech_eap/util_context.c
+++ b/mech_eap/util_context.c
@@ -115,7 +115,7 @@ gssEapReleaseContext(OM_uint32 *minor,
 
 #ifdef GSSEAP_ENABLE_REAUTH
     if (ctx->flags & CTX_FLAG_KRB_REAUTH) {
 
 #ifdef GSSEAP_ENABLE_REAUTH
     if (ctx->flags & CTX_FLAG_KRB_REAUTH) {

-        gssDeleteSecContext(&tmpMinor, &ctx->kerberosCtx, GSS_C_NO_BUFFER);
+        gssDeleteSecContext(&tmpMinor, &ctx->reauthCtx, GSS_C_NO_BUFFER);

     } else
 #endif
     if (CTX_IS_INITIATOR(ctx)) {
     } else
 #endif
     if (CTX_IS_INITIATOR(ctx)) {

diff --git a/mech_eap/util_reauth.c b/mech_eap/util_reauth.c
index 465bb16..6c66570 100644 (file)
--- a/mech_eap/util_reauth.c
+++ b/mech_eap/util_reauth.c
@@ -739,7 +739,7 @@ gssEapGlueToMechName(OM_uint32 *minor,
 
     major = defrostAttrContext(minor,
 #ifdef HAVE_HEIMDAL_VERSION
 
     major = defrostAttrContext(minor,
 #ifdef HAVE_HEIMDAL_VERSION

-                               ctx->kerberosCtx,
+                               ctx->reauthCtx,

 #else
                                glueName,
 #endif
 #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 */
     /* 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 */
                                       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))
                                       GSS_C_INQ_SSPI_SESSION_KEY, &keyData);
 #endif
     if (GSS_ERROR(major))