From: Luke Howard <lukeh@padl.com>
Date: Tue, 28 Sep 2010 16:01:39 +0000 (+0200)
Subject: skip legacy SASL mechanisms if client wants CB
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=cyrus-sasl.git;a=commitdiff_plain;h=7c7851704505a352e2998253e61e8a641e76bc73

skip legacy SASL mechanisms if client wants CB
---

diff --git a/lib/client.c b/lib/client.c
index 58aeb0d..18bab7d 100644
--- a/lib/client.c
+++ b/lib/client.c
@@ -601,7 +601,7 @@ int sasl_client_start(sasl_conn_t *conn,
 	    }
 
 	    /* Can we meet it's features? */
-	   if (SASL_CB_PRESENT(c_conn->cparams) &&
+	    if (cbindingdisp != SASL_CB_DISP_NONE &&
 		!(m->m.plug->features & SASL_FEAT_CHANNEL_BINDING)) {
 		break;
 	    }