Fix no CB case
authorLuke Howard <lukeh@padl.com>
Fri, 10 Sep 2010 11:11:55 +0000 (13:11 +0200)
committerLuke Howard <lukeh@padl.com>
Fri, 10 Sep 2010 11:11:55 +0000 (13:11 +0200)
mech_eap/init_sec_context.c

index 206590f..ca8492e 100644 (file)
@@ -452,17 +452,12 @@ eapGssSmInitGssChannelBindings(OM_uint32 *minor,
     iov[1].buffer.length = 0;
     iov[1].buffer.value = NULL;
 
-    if (chanBindings != GSS_C_NO_CHANNEL_BINDINGS) {
-        major = gssEapEncodeGssChannelBindings(minor, chanBindings,
-                                                &iov[0].buffer);
-        if (GSS_ERROR(major))
-            goto cleanup;
+    major = gssEapEncodeGssChannelBindings(minor, chanBindings,
+                                            &iov[0].buffer);
+    if (GSS_ERROR(major))
+        goto cleanup;
 
-        iov[0].type |= GSS_IOV_BUFFER_FLAG_ALLOCATED;
-    } else {
-        iov[0].buffer.length = sizeof("NO_CHANNEL_BINDINGS") - 1;
-        iov[0].buffer.value = "NO_CHANNEL_BINDINGS";
-    }
+    iov[0].type |= GSS_IOV_BUFFER_FLAG_ALLOCATED;
 
     major = gssEapWrapOrGetMIC(minor, ctx, FALSE, FALSE, iov, 2,
                                TOK_TYPE_GSS_CB);