projects
/
moonshot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
f1112ca
..
a1d7251
100644
(file)
--- a/
mech_eap/util_reauth.c
+++ b/
mech_eap/util_reauth.c
@@
-217,11
+217,10
@@
gssEapMakeReauthCreds(OM_uint32 *minor,
GSSEAP_KRB_INIT(&krbContext);
code = getAcceptorKey(krbContext, ctx, cred, &server, &acceptorKey);
GSSEAP_KRB_INIT(&krbContext);
code = getAcceptorKey(krbContext, ctx, cred, &server, &acceptorKey);
- if (code
== KRB5_KT_NOTFOUND
) {
+ if (code
!= 0
) {
*minor = code;
return GSS_S_UNAVAILABLE;
*minor = code;
return GSS_S_UNAVAILABLE;
- } else if (code != 0)
- goto cleanup;
+ }
/*
* Generate a random session key to place in the ticket and
/*
* Generate a random session key to place in the ticket and
@@
-455,7
+454,7
@@
getDefaultReauthCredentials(OM_uint32 *minor,
ccache = NULL;
major = gss_krb5_import_cred(minor, cred->krbCredCache, NULL, NULL,
ccache = NULL;
major = gss_krb5_import_cred(minor, cred->krbCredCache, NULL, NULL,
- &cred->
krb
Cred);
+ &cred->
reauth
Cred);
cleanup:
if (major == GSS_S_CRED_UNAVAIL)
cleanup:
if (major == GSS_S_CRED_UNAVAIL)
@@
-573,7
+572,7
@@
gssEapStoreReauthCreds(OM_uint32 *minor,
krb5_cc_destroy(krbContext, cred->krbCredCache);
cred->krbCredCache = NULL;
}
krb5_cc_destroy(krbContext, cred->krbCredCache);
cred->krbCredCache = NULL;
}
- gssReleaseCred(minor, &cred->
krb
Cred);
+ gssReleaseCred(minor, &cred->
reauth
Cred);
}
if (cred->krbCredCache == NULL) {
}
if (cred->krbCredCache == NULL) {
@@
-608,7
+607,7
@@
gssEapStoreReauthCreds(OM_uint32 *minor,
}
major = gss_krb5_import_cred(minor, cred->krbCredCache, NULL, NULL,
}
major = gss_krb5_import_cred(minor, cred->krbCredCache, NULL, NULL,
- &cred->
krb
Cred);
+ &cred->
reauth
Cred);
if (GSS_ERROR(major))
goto cleanup;
if (GSS_ERROR(major))
goto cleanup;
@@
-655,9
+654,8
@@
defrostAttrContext(OM_uint32 *minor,
#ifdef HAVE_HEIMDAL_VERSION
gss_ctx_id_t glueContext,
#else
#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 glueName,
+#endif
gss_name_t mechName)
{
OM_uint32 major, tmpMinor;
gss_name_t mechName)
{
OM_uint32 major, tmpMinor;
@@
-735,11
+733,17
@@
gssEapGlueToMechName(OM_uint32 *minor,
goto cleanup;
major = gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
goto cleanup;
major = gssEapImportName(minor, &nameBuf, GSS_C_NT_USER_NAME,
- pMechName);
+
ctx->mechanismUsed,
pMechName);
if (GSS_ERROR(major))
goto cleanup;
if (GSS_ERROR(major))
goto cleanup;
- major = defrostAttrContext(minor, ctx->kerberosCtx, glueName, *pMechName);
+ major = defrostAttrContext(minor,
+#ifdef HAVE_HEIMDAL_VERSION
+ ctx->reauthCtx,
+#else
+ glueName,
+#endif
+ *pMechName);
if (GSS_ERROR(major))
goto cleanup;
if (GSS_ERROR(major))
goto cleanup;
@@
-811,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->
kerberos
Ctx,
+ major = gssInquireSecContextByOid(minor, ctx->
reauth
Ctx,
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->
kerberos
Ctx,
+ major = gssInquireSecContextByOid(minor, ctx->
reauth
Ctx,
GSS_C_INQ_SSPI_SESSION_KEY, &keyData);
#endif
if (GSS_ERROR(major))
GSS_C_INQ_SSPI_SESSION_KEY, &keyData);
#endif
if (GSS_ERROR(major))