Don't install alloc routines when using SASLv2

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index b892accecdf488429f1e07c159a4baf5c08940d5..59d5b41cf7e5a92a69bb433d6f18343e2242f152 100644 (file)
--- 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,