From: Howard Chu <hyc@openldap.org>
Date: Wed, 6 Sep 2017 20:46:09 +0000 (+0100)
Subject: ITS#8717 call connection delete callbacks
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=738723866ed6858cb694b0a770300d781e09e333;p=openldap

ITS#8717 call connection delete callbacks

When TLS fails to start
---

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 11564f9c27..cd81d9c536 100644
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -450,6 +450,31 @@ ldap_int_open_connection(
 		--conn->lconn_refcnt;
 
 		if (rc != LDAP_SUCCESS) {
+			/* process connection callbacks */
+			{
+				struct ldapoptions *lo;
+				ldaplist *ll;
+				ldap_conncb *cb;
+
+				lo = &ld->ld_options;
+				LDAP_MUTEX_LOCK( &lo->ldo_mutex );
+				if ( lo->ldo_conn_cbs ) {
+					for ( ll=lo->ldo_conn_cbs; ll; ll=ll->ll_next ) {
+						cb = ll->ll_data;
+						cb->lc_del( ld, conn->lconn_sb, cb );
+					}
+				}
+				LDAP_MUTEX_UNLOCK( &lo->ldo_mutex );
+				lo = LDAP_INT_GLOBAL_OPT();
+				LDAP_MUTEX_LOCK( &lo->ldo_mutex );
+				if ( lo->ldo_conn_cbs ) {
+					for ( ll=lo->ldo_conn_cbs; ll; ll=ll->ll_next ) {
+						cb = ll->ll_data;
+						cb->lc_del( ld, conn->lconn_sb, cb );
+					}
+				}
+				LDAP_MUTEX_UNLOCK( &lo->ldo_mutex );
+			}
 			return -1;
 		}
 	}