From: Patrick Monnerat <patrick@monnerat.net>
Date: Sun, 28 Mar 2021 09:43:11 +0000 (+0200)
Subject: ldap: only set the callback ptr for TLS context when TLS is used
X-Git-Tag: curl-7_76_0~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cbc16b2f9eb2fca20009235668b7fb751cc1826;p=thirdparty%2Fcurl.git

ldap: only set the callback ptr for TLS context when TLS is used

Follow-up to a5eee22e594c2460f
Fixes #6804
Closes #6805
---

diff --git a/lib/openldap.c b/lib/openldap.c
index 049ddd4375..b6980c5900 100644
--- a/lib/openldap.c
+++ b/lib/openldap.c
@@ -365,13 +365,14 @@ static CURLcode ldap_disconnect(struct Curl_easy *data,
 {
   struct ldapconninfo *li = conn->proto.ldapc;
   (void) dead_connection;
-  (void) data;
 
   if(li) {
     if(li->ld) {
-      Sockbuf *sb;
-      ldap_get_option(li->ld, LDAP_OPT_SOCKBUF, &sb);
-      ber_sockbuf_add_io(sb, &ldapsb_tls, LBER_SBIOD_LEVEL_TRANSPORT, data);
+      if(conn->ssl[FIRSTSOCKET].use) {
+        Sockbuf *sb;
+        ldap_get_option(li->ld, LDAP_OPT_SOCKBUF, &sb);
+        ber_sockbuf_add_io(sb, &ldapsb_tls, LBER_SBIOD_LEVEL_TRANSPORT, data);
+      }
       ldap_unbind_ext(li->ld, NULL, NULL);
       li->ld = NULL;
     }