ITS#4957: slapd mutex bug after failed startup

diff --git a/CHANGES b/CHANGES
index 8682444aaf7b39ea474bbf3dfebbb4b94bc288fd..cdfc599ea26d21e29dd46f2bbd6ec7a2a49a0b56 100644 (file)
--- 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 8544f641cb8268f492ad6c1cfa134796b225dc23..9532192a4c0dd6c71dcf4be78fcefcc5dab3476e 100644 (file)
--- 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 );
+       }
 }