projects
/
moonshot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6f53ff0
)
Change krbCred member to reauthCred to better clarify purpose
author
Luke Howard
<lukeh@padl.com>
Fri, 22 Apr 2011 10:58:20 +0000
(12:58 +0200)
committer
Luke Howard
<lukeh@padl.com>
Fri, 22 Apr 2011 10:58:20 +0000
(12:58 +0200)
mech_eap/accept_sec_context.c
patch
|
blob
|
history
mech_eap/gssapiP_eap.h
patch
|
blob
|
history
mech_eap/init_sec_context.c
patch
|
blob
|
history
mech_eap/store_cred.c
patch
|
blob
|
history
mech_eap/util_cred.c
patch
|
blob
|
history
mech_eap/util_reauth.c
patch
|
blob
|
history
diff --git
a/mech_eap/accept_sec_context.c
b/mech_eap/accept_sec_context.c
index
6776047
..
cc8702d
100644
(file)
--- 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,
major = gssAcceptSecContext(minor,
&ctx->reauthCtx,
- cred->
krb
Cred,
+ cred->
reauth
Cred,
inputToken,
chanBindings,
&krbInitiator,
inputToken,
chanBindings,
&krbInitiator,
diff --git
a/mech_eap/gssapiP_eap.h
b/mech_eap/gssapiP_eap.h
index
89a0d8c
..
d1d6bce
100644
(file)
--- 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;
char *radiusConfigStanza;
#ifdef GSSEAP_ENABLE_REAUTH
krb5_ccache krbCredCache;
- gss_cred_id_t
krb
Cred;
+ gss_cred_id_t
reauth
Cred;
#endif
};
#endif
};
diff --git
a/mech_eap/init_sec_context.c
b/mech_eap/init_sec_context.c
index
2e4b23b
..
930eb32
100644
(file)
--- 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,
goto cleanup;
major = gssInitSecContext(minor,
- cred->
krb
Cred,
+ cred->
reauth
Cred,
&ctx->reauthCtx,
mechTarget,
(gss_OID)gss_mech_krb5,
&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
(file)
--- 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
*minor = 0;
#ifdef GSSEAP_ENABLE_REAUTH
- if (cred->
krb
Cred != GSS_C_NO_CREDENTIAL) {
+ if (cred->
reauth
Cred != GSS_C_NO_CREDENTIAL) {
major = gssStoreCred(minor,
major = gssStoreCred(minor,
- cred->
krb
Cred,
+ cred->
reauth
Cred,
input_usage,
(gss_OID)gss_mech_krb5,
overwrite_cred,
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
(file)
--- 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);
}
else
krb5_cc_destroy(krbContext, cred->krbCredCache);
}
- if (cred->
krb
Cred != GSS_C_NO_CREDENTIAL)
- gssReleaseCred(&tmpMinor, &cred->
krb
Cred);
+ if (cred->
reauth
Cred != GSS_C_NO_CREDENTIAL)
+ gssReleaseCred(&tmpMinor, &cred->
reauth
Cred);
#endif
GSSEAP_MUTEX_DESTROY(&cred->mutex);
#endif
GSSEAP_MUTEX_DESTROY(&cred->mutex);
diff --git
a/mech_eap/util_reauth.c
b/mech_eap/util_reauth.c
index
6c66570
..
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,
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)
@@
-572,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) {
@@
-607,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;