From: Luke Howard <lukeh@padl.com>
Date: Mon, 16 May 2011 07:59:03 +0000 (+0200)
Subject: remove attempt to autdetect base64, it's broken
X-Git-Tag: tr-beta1~156
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=b5b9f68ebdf1164649e2d6aaf774648ec0c44667

remove attempt to autdetect base64, it's broken

instead, put a special hack for urn:mspac: until Shibboleth is fixed
---

diff --git a/moonshot/mech_eap/util_shib.cpp b/moonshot/mech_eap/util_shib.cpp
index 0ee894b..b01bf7b 100644
--- a/moonshot/mech_eap/util_shib.cpp
+++ b/moonshot/mech_eap/util_shib.cpp
@@ -304,8 +304,9 @@ gss_eap_shib_attr_provider::getAttribute(const gss_buffer_t attr,
     buf.value = (void *)shibAttr->getSerializedValues()[*more].c_str();
     buf.length = strlen((char *)buf.value);
 
-    /* FIXME treating all valid base64 values as binary is bad */
-    if (base64Valid((char *)buf.value)) {
+    /* XXX hack until we have proper binary attribute support */
+    if (attr->length == sizeof("urn:mspac:") - 1 &&
+        memcmp(attr->value, "urn:mspac:", attr->length) == 0) {
         ssize_t octetLen;
 
         value->value = GSSEAP_MALLOC(buf.length);