projects
/
moonshot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5e24b27
)
don't advertise EAP parent OID as a SASL mech
author
Luke Howard
<lukeh@padl.com>
Sat, 25 Sep 2010 16:35:07 +0000
(18:35 +0200)
committer
Luke Howard
<lukeh@padl.com>
Sat, 25 Sep 2010 16:35:07 +0000
(18:35 +0200)
mech_eap/inquire_mech_for_saslname.c
patch
|
blob
|
history
diff --git
a/mech_eap/inquire_mech_for_saslname.c
b/mech_eap/inquire_mech_for_saslname.c
index
0d0d60f
..
e0c9f76
100644
(file)
--- a/
mech_eap/inquire_mech_for_saslname.c
+++ b/
mech_eap/inquire_mech_for_saslname.c
@@
-42,6
+42,10
@@
gss_inquire_saslname_for_mech(OM_uint32 *minor,
gss_buffer_t name;
krb5_enctype etype = ENCTYPE_NULL;
krb5_context krbContext;
gss_buffer_t name;
krb5_enctype etype = ENCTYPE_NULL;
krb5_context krbContext;
+ char krbBuf[128] = "eap-";
+
+ if (oidEqual(mech, GSS_EAP_MECHANISM))
+ return GSS_S_UNAVAILABLE;
GSSEAP_KRB_INIT(&krbContext);
GSSEAP_KRB_INIT(&krbContext);
@@
-50,14
+54,11
@@
gss_inquire_saslname_for_mech(OM_uint32 *minor,
mech_description);
/* Dynamically construct mechanism name from Kerberos string enctype */
mech_description);
/* Dynamically construct mechanism name from Kerberos string enctype */
- if (oidEqual(mech, GSS_EAP_MECHANISM)) {
- makeStringBuffer(minor, "eap", mech_name);
- } else if (gssEapOidToEnctype(minor, mech, &etype) == GSS_S_COMPLETE) {
- char krbBuf[128] = "eap-";
+ if (gssEapOidToEnctype(minor, mech, &etype) != GSS_S_COMPLETE)
+ return GSS_S_BAD_MECH;
- if (krb5_enctype_to_name(etype, 0, &krbBuf[4], sizeof(krbBuf) - 4) == 0)
- makeStringBuffer(minor, krbBuf, mech_name);
- }
+ if (krb5_enctype_to_name(etype, 0, &krbBuf[4], sizeof(krbBuf) - 4) == 0)
+ makeStringBuffer(minor, krbBuf, mech_name);
name = gssEapOidToSaslName(mech);
if (name == GSS_C_NO_BUFFER)
name = gssEapOidToSaslName(mech);
if (name == GSS_C_NO_BUFFER)