From: Luke Howard <lukeh@padl.com>
Date: Mon, 27 Sep 2010 00:57:53 +0000 (+0200)
Subject: avoid legacy mechs if we require CB
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=cyrus-sasl.git;a=commitdiff_plain;h=fb2461329470662daf41a83274cd9f64aa86389d

avoid legacy mechs if we require CB
---

diff --git a/lib/client.c b/lib/client.c
index 1ba3874..daf3543 100644
--- a/lib/client.c
+++ b/lib/client.c
@@ -555,6 +555,11 @@ int sasl_client_start(sasl_conn_t *conn,
 	    }
 
 	    /* Can we meet it's features? */
+            if (SASL_CB_PRESENT(c_conn->cparams) &&
+                !(m->m.plug->features & SASL_FEAT_CHANNEL_BINDING)) {
+                break;
+            }
+
 	    if ((m->m.plug->features & SASL_FEAT_NEEDSERVERFQDN)
 		&& !conn->serverFQDN) {
 		break;