From: Hallvard Furuseth <hallvard@openldap.org>
Date: Sun, 13 May 2007 20:15:21 +0000 (+0000)
Subject: ITS#4957: slapd mutex bug after failed startup
X-Git-Tag: OPENLDAP_REL_ENG_2_3_36~39
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a9f2ef77a2e7560cd453028e634f82e95346b515;p=openldap

ITS#4957: slapd mutex bug after failed startup
---

diff --git a/CHANGES b/CHANGES
index 8682444aaf..cdfc599ea2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.36 Engineering
 	Fixed slapd error code on Windows (ITS#4945, #4606)
+	Fixed slapd mutex bug after failed startup (ITS#4957)
 	Fixed slapd-config olcModuleLoad replace (ITS#4921)
 	Fixed slapd-bdb no-op crasher (ITS#4925)
 	Fixed libldap response code handling on rebind (ITS#4924)
diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 8544f641cb..9532192a4c 100644
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -4001,6 +4001,8 @@ schema_destroy( void )
 	mru_destroy();
 	syn_destroy();
 
-	ldap_pvt_thread_mutex_destroy( &ad_undef_mutex );
-	ldap_pvt_thread_mutex_destroy( &oc_undef_mutex );
+	if( schema_init_done ) {
+		ldap_pvt_thread_mutex_destroy( &ad_undef_mutex );
+		ldap_pvt_thread_mutex_destroy( &oc_undef_mutex );
+	}
 }