Do not allocate a new cbinding if we have one already.

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 5dbaf135ebe4e154a4e0e1d1832ea2b507e23489..79545f8632164fcc4a53a5735898d1747003880a 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -481,7 +481,8 @@ ldap_int_sasl_bind(
                        {
                                char cbinding[64];
                                struct berval cbv = { sizeof(cbinding), cbinding };
-                               if ( ldap_pvt_tls_get_unique( ssl, &cbv, 0 )) {
+                               if ( ld->ld_defconn->lconn_sasl_cbind == NULL &&
+                                       ldap_pvt_tls_get_unique( ssl, &cbv, 0 )) {
                                        sasl_channel_binding_t *cb = ldap_memalloc( sizeof(*cb) +
                                                cbv.bv_len);
                                        void *cb_data; /* used since cb->data is const* */