From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 6 Sep 2002 03:20:48 +0000 (+0000)
Subject: Don't install alloc routines when using SASLv2
X-Git-Tag: OPENLDAP_REL_ENG_2_1_5~55
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=15d87e412823c4b5ca44bf4f1aa511d0d8c3e319;p=openldap

Don't install alloc routines when using SASLv2
---

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index b892accecd..59d5b41cf7 100644
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -82,7 +82,8 @@ int ldap_int_sasl_init( void )
 		return 0;
 	}
 
-#ifndef CSRIMALLOC
+/* SASL 2 takes care of its own memory completely internally */
+#if SASL_VERSION_MAJOR < 2 && !defined(CSRIMALLOC)
 	sasl_set_alloc(
 		ber_memalloc,
 		ber_memcalloc,