Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot

Conflicts:
	moonshot/mech_eap/util_saml.cpp

diff --git a/moonshot/mech_eap/TODO b/moonshot/mech_eap/TODO
index d622364..17780ec 100644 (file)
--- a/moonshot/mech_eap/TODO
+++ b/moonshot/mech_eap/TODO
@@ -4,4 +4,4 @@
 
 - fix ABNF: no slash in the case where there is no host
 - specify anonymous behaviour: use empty name
-
+- always intern OIDs so they never need to be freed

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;
-    OM_uint32 major, tmpMinor;
+    OM_uint32 major;
     krb5_enctype *etypes;
     int i;
 
@@ -202,6 +202,9 @@ gssEapIndicateMechs(OM_uint32 *minor,
 
     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)
@@ -215,7 +218,9 @@ gssEapIndicateMechs(OM_uint32 *minor,
         if (GSS_ERROR(major))
             break;
 
+#ifndef HAVE_HEIMDAL_VERSION
         gss_release_oid(&tmpMinor, &mechOid);
+#endif
     }
 
     GSSEAP_FREE(etypes);

diff --git a/moonshot/mech_eap/util_saml.cpp b/moonshot/mech_eap/util_saml.cpp
index 3363ce2..41bedad 100644 (file)
--- a/moonshot/mech_eap/util_saml.cpp
+++ b/moonshot/mech_eap/util_saml.cpp
@@ -363,7 +363,7 @@ gss_eap_saml_attr_provider::getAssertion(int *authenticated,
     if (pAssertion != NULL)
         *pAssertion = NULL;
 
-    saml = static_cast< gss_eap_saml_assertion_provider *>
+    saml = static_cast<gss_eap_saml_assertion_provider *>
         (m_manager->getProvider(ATTR_TYPE_SAML_ASSERTION));
     if (saml == NULL)
         return false;