From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 15 Dec 2008 19:41:32 +0000 (+0000)
Subject: ITS#5841
X-Git-Tag: OPENLDAP_REL_ENG_2_4_14~132
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=210b7225a85572a6c33444dcb7435ba1e8e6b4fb;p=openldap

ITS#5841
---

diff --git a/CHANGES b/CHANGES
index 5ce9453a52..152edc75bf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ OpenLDAP 2.4.14 Engineering
 	Fixed libldap deref handling (ITS#5768)
 	Fixed libldap peer cert memory leak (ITS#5849)
 	Fixed libldap_r deref building (ITS#5768)
+	Fixed libldap_r slapd lockup when paused during shutdown (ITS#5841)
 	Fixed slapd syncrepl rename handling (ITS#5809)
 	Fixed slapd syncrepl MMR when adding new server (ITS#5850)
 	Fixed slapd-meta double response sending (ITS#5854)
diff --git a/libraries/libldap_r/tpool.c b/libraries/libldap_r/tpool.c
index fa22d7d9a4..7fcfa368c6 100644
--- a/libraries/libldap_r/tpool.c
+++ b/libraries/libldap_r/tpool.c
@@ -785,8 +785,7 @@ ldap_pvt_thread_pool_resume (
 	SET_VARY_OPEN_COUNT(pool);
 	pool->ltp_work_list = &pool->ltp_pending_list;
 
-	if (!pool->ltp_finishing)
-		ldap_pvt_thread_cond_broadcast(&pool->ltp_cond);
+	ldap_pvt_thread_cond_broadcast(&pool->ltp_cond);
 
 	ldap_pvt_thread_mutex_unlock(&pool->ltp_mutex);
 	return(0);