projects
/
moonshot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
37976de
)
don't release mech OID on Heimdal
author
Luke Howard
<lukeh@padl.com>
Thu, 12 May 2011 20:33:22 +0000
(22:33 +0200)
committer
Luke Howard
<lukeh@padl.com>
Thu, 12 May 2011 20:33:45 +0000
(22:33 +0200)
moonshot/mech_eap/util_mech.c
patch
|
blob
|
history
diff --git
a/moonshot/mech_eap/util_mech.c
b/moonshot/mech_eap/util_mech.c
index
131ac0b
..
958e43d
100644
(file)
--- a/
moonshot/mech_eap/util_mech.c
+++ b/
moonshot/mech_eap/util_mech.c
@@
-183,7
+183,7
@@
gssEapIndicateMechs(OM_uint32 *minor,
gss_OID_set *mechs)
{
krb5_context krbContext;
gss_OID_set *mechs)
{
krb5_context krbContext;
- OM_uint32 major
, tmpMinor
;
+ OM_uint32 major;
krb5_enctype *etypes;
int i;
krb5_enctype *etypes;
int i;
@@
-202,6
+202,9
@@
gssEapIndicateMechs(OM_uint32 *minor,
for (i = 0; etypes[i] != ENCTYPE_NULL; i++) {
gss_OID mechOid;
for (i = 0; etypes[i] != ENCTYPE_NULL; i++) {
gss_OID mechOid;
+#ifndef HAVE_HEIMDAL_VERSION
+ OM_uint32 tmpMinor;
+#endif
/* XXX currently we aren't equipped to encode these enctypes */
if (etypes[i] < 0 || etypes[i] > 127)
/* XXX currently we aren't equipped to encode these enctypes */
if (etypes[i] < 0 || etypes[i] > 127)
@@
-215,7
+218,9
@@
gssEapIndicateMechs(OM_uint32 *minor,
if (GSS_ERROR(major))
break;
if (GSS_ERROR(major))
break;
+#ifndef HAVE_HEIMDAL_VERSION
gss_release_oid(&tmpMinor, &mechOid);
gss_release_oid(&tmpMinor, &mechOid);
+#endif
}
GSSEAP_FREE(etypes);
}
GSSEAP_FREE(etypes);