sl_free fix

diff --git a/CHANGES b/CHANGES
index e3188aefffec115029d622154ef47a42b17c1dac..7262099ce6e7eb8faab3eeacb0805957627836ab 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@ OpenLDAP 2.2 Change Log
 OpenLDAP 2.2.11 Engineering
        Fixed slapd undefined objectclass bug (ITS#3097)
        Updated slapd limits handling
+       Build Environment
+               Fix MacOSX sl_free interop bug (ITS#3092)
 
 OpenLDAP 2.2.10 Release
        Build Environment

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 0400c5282a56bde309bf0f35ad3e564310580551..843c469a5a315040d5a2180f65c41ba2092ceec2 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1092,6 +1092,8 @@ LDAP_SLAPD_V (BerMemoryFunctions) sl_mfuncs;
 LDAP_SLAPD_F (void *) sl_malloc LDAP_P(( ber_len_t size, void *ctx ));
 LDAP_SLAPD_F (void *) sl_realloc LDAP_P(( void *block, ber_len_t size, void *ctx ));
 LDAP_SLAPD_F (void *) sl_calloc LDAP_P(( ber_len_t nelem, ber_len_t size, void *ctx ));
+#undef sl_free
+#define sl_free slap_sl_free /* MACOSX quick fix */
 LDAP_SLAPD_F (void) sl_free LDAP_P(( void *, void *ctx ));
 LDAP_SLAPD_F (void) sl_mem_init LDAP_P(( void ));
 LDAP_SLAPD_F (void *) sl_mem_create LDAP_P(( ber_len_t size, void *ctx ));