Fix in 1.50 applies to Cyrus 1 as well as Cyrus 2.

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index edb79429cddefa06e02dedb5cab4fc05aadb96f8..079ffef4ee80454cb84dd16d3a5f7f40cf71e90d 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -459,7 +459,6 @@ ldap_int_sasl_open(
 #else
        rc = sasl_client_new( "ldap", host, session_callbacks,
                SASL_SECURITY_LAYER, &ctx );
-       LDAP_FREE( session_callbacks );
 #endif
 
        if ( rc != SASL_OK ) {
@@ -506,13 +505,11 @@ int ldap_int_sasl_close( LDAP *ld, LDAPConn *lc )
        sasl_conn_t *ctx = lc->lconn_sasl_ctx;
 
        if( ctx != NULL ) {
-#if SASL_VERSION_MAJOR >= 2
                const void *callbacks;
                sasl_getprop( ctx, SASL_CALLBACK, &callbacks );
-               LDAP_FREE( (void *)callbacks );
-#endif
                sasl_dispose( &ctx );
                lc->lconn_sasl_ctx = NULL;
+               LDAP_FREE( (void *)callbacks );
        }
 
        return LDAP_SUCCESS;