From 5b55054544bbee0d5be0dcd50ed94f9dd61d2fae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= Date: Wed, 27 Mar 2019 10:25:58 +0000 Subject: [PATCH] Do not allocate a new cbinding if we have one already. --- libraries/libldap/cyrus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c index 5dbaf135eb..79545f8632 100644 --- 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* */