ITS#6859

diff --git a/CHANGES b/CHANGES
index 75a33a21751419c906d7755131b8e207dbbbbcb6..ed3ffc316c11d21fa056760b3c3e588629a54eaf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,11 +7,13 @@ OpenLDAP 2.4.25 Engineering
        Added slapd ordering for uidNumber and gidNumber (ITS#6852)
        Fixed slapd segfault when adding values out of order (ITS#6858)
        Fixed slapd sortval handling (ITS#6845)
+       Fixed slapd-bdb with slapadd/index quick option (ITS#6853)
        Fixed slapd-ldap chain cn=config support (ITS#6837)
        Fixed slapd-ldap chain with slapd.conf (ITS#6857)
        Fixed slapd-meta deadlock (ITS#6846)
        Fixed slapo-sssvlv with multiple requests (ITS#6850)
        Build Environment
+               Fixed windows NT threads build (ITS#6859)
                Fixed libldap/lberl/util if/else usage (ITS#6832)
                Fixed Windows odbc32 detection (ITS#6125)
                Fixed test020 exit codes (ITS#6404)

diff --git a/include/ldap_int_thread.h b/include/ldap_int_thread.h
index dd7d4db908bd7565d021aeb77f1ee028a2ee5560..fdcc4ad6c369c0d7698a50d064ca67cd0cd7ead5 100644 (file)
--- a/include/ldap_int_thread.h
+++ b/include/ldap_int_thread.h
@@ -183,7 +183,7 @@ typedef DWORD       ldap_int_thread_key_t;
 #ifndef LDAP_INT_MUTEX_NULL
 #define LDAP_INT_MUTEX_NULL            ((HANDLE)0)
 #define LDAP_INT_MUTEX_FIRSTCREATE(m) \
-               ((void) ((m) || ldap_int_thread_mutex_init(&(m))))
+               ((void) ((m) || ldap_pvt_thread_mutex_init(&(m))))
 #endif
 
 LDAP_END_DECL