projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for Heimdal (macOS) builds from Stefan.
[mech_eap.git]
/
mech_eap
/
util_reauth.c
diff --git
a/mech_eap/util_reauth.c
b/mech_eap/util_reauth.c
index
32ed781
..
cd85a53
100644
(file)
--- a/
mech_eap/util_reauth.c
+++ b/
mech_eap/util_reauth.c
@@
-214,6
+214,11
@@
gssEapMakeReauthCreds(OM_uint32 *minor,
credBuf->length = 0;
credBuf->value = NULL;
credBuf->length = 0;
credBuf->value = NULL;
+ if (ctx->acceptorName == GSS_C_NO_NAME) {
+ *minor = GSSEAP_NO_ACCEPTOR_NAME;
+ return GSS_S_UNAVAILABLE;
+ }
+
GSSEAP_KRB_INIT(&krbContext);
code = getAcceptorKey(krbContext, ctx, cred, &server, &acceptorKey);
GSSEAP_KRB_INIT(&krbContext);
code = getAcceptorKey(krbContext, ctx, cred, &server, &acceptorKey);
@@
-485,7
+490,8
@@
gssEapCanReauthP(gss_cred_id_t cred,
time_t now, expiryReq;
OM_uint32 minor;
time_t now, expiryReq;
OM_uint32 minor;
- GSSEAP_ASSERT(cred != GSS_C_NO_CREDENTIAL);
+ if (cred == GSS_C_NO_CREDENTIAL)
+ return FALSE;
now = time(NULL);
expiryReq = now;
now = time(NULL);
expiryReq = now;
@@
-634,7
+640,7
@@
cleanup:
#ifndef HAVE_HEIMDAL_VERSION
static gss_buffer_desc radiusAvpKrbAttr = {
#ifndef HAVE_HEIMDAL_VERSION
static gss_buffer_desc radiusAvpKrbAttr = {
- sizeof("urn:authdata-
radius-avp") - 1, "urn:authdata-radius-avp
"
+ sizeof("urn:authdata-
aaa-radius") - 1, "urn:authdata-aaa-radius
"
};
#endif
};
#endif
@@
-1091,7
+1097,7
@@
OM_uint32
gssReleaseName(OM_uint32 *minor,
gss_name_t *name)
{
gssReleaseName(OM_uint32 *minor,
gss_name_t *name)
{
- if (gssReleaseName == NULL) {
+ if (gssReleaseName
Next
== NULL) {
*minor = GSSEAP_NO_MECHGLUE_SYMBOL;
return GSS_S_UNAVAILABLE;
}
*minor = GSSEAP_NO_MECHGLUE_SYMBOL;
return GSS_S_UNAVAILABLE;
}