From: Luke Howard <lukeh@padl.com>
Date: Fri, 9 Sep 2011 21:17:56 +0000 (+0100)
Subject: Merge branch 'master' into ext-mic
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.orig;a=commitdiff_plain;h=39eb06619b272d3fdcf0756d97c80e4eb75bcf8d;hp=2b1385bc91ff5e797297b56184f56b5637f6a615

Merge branch 'master' into ext-mic
---

diff --git a/mech_eap/display_status.c b/mech_eap/display_status.c
index b3cf2f9..584eac9 100644
--- a/mech_eap/display_status.c
+++ b/mech_eap/display_status.c
@@ -132,6 +132,8 @@ gssEapSaveStatusInfo(OM_uint32 minor, const char *format, ...)
     if (format != NULL) {
         va_start(ap, format);
         n = vasprintf(&s, format, ap);
+        if (n == -1)
+            s = NULL;
         va_end(ap);
     }
 
diff --git a/mech_eap/init_sec_context.c b/mech_eap/init_sec_context.c
index 1945f09..fde5786 100644
--- a/mech_eap/init_sec_context.c
+++ b/mech_eap/init_sec_context.c
@@ -647,7 +647,6 @@ eapGssSmInitAuthenticate(OM_uint32 *minor,
 {
     OM_uint32 major;
     OM_uint32 tmpMinor;
-    int code;
     struct wpabuf *resp = NULL;
 
     *minor = 0;
@@ -668,7 +667,7 @@ eapGssSmInitAuthenticate(OM_uint32 *minor,
 
     major = GSS_S_CONTINUE_NEEDED;
 
-    code = eap_peer_sm_step(ctx->initiatorCtx.eap);
+    eap_peer_sm_step(ctx->initiatorCtx.eap);
     if (ctx->flags & CTX_FLAG_EAP_RESP) {
         ctx->flags &= ~(CTX_FLAG_EAP_RESP);
 
diff --git a/mech_eap/unwrap_iov.c b/mech_eap/unwrap_iov.c
index 19bafc6..2156e51 100644
--- a/mech_eap/unwrap_iov.c
+++ b/mech_eap/unwrap_iov.c
@@ -319,7 +319,7 @@ unwrapStream(OM_uint32 *minor,
     unsigned char *ptr;
     OM_uint32 code = 0, major = GSS_S_FAILURE;
     krb5_context krbContext;
-    int conf_req_flag, toktype2;
+    int conf_req_flag;
     int i = 0, j;
     gss_iov_buffer_desc *tiov = NULL;
     gss_iov_buffer_t stream, data = NULL;
@@ -346,8 +346,7 @@ unwrapStream(OM_uint32 *minor,
     }
 
     ptr = (unsigned char *)stream->buffer.value;
-    toktype2 = load_uint16_be(ptr);
-    ptr += 2;
+    ptr += 2; /* skip token type */
 
     tiov = (gss_iov_buffer_desc *)GSSEAP_CALLOC((size_t)iov_count + 2,
                                                 sizeof(gss_iov_buffer_desc));
diff --git a/mech_eap/util_shib.cpp b/mech_eap/util_shib.cpp
index 311de41..65900a8 100644
--- a/mech_eap/util_shib.cpp
+++ b/mech_eap/util_shib.cpp
@@ -436,8 +436,7 @@ gss_eap_shib_attr_provider::init(void)
     bool ret = false;
 
     try {
-        if (SPConfig::getConfig().getFeatures() == 0)
-            ret = ShibbolethResolver::init();
+        ret = ShibbolethResolver::init();
     } catch (exception &e) {
     }