For Cyrus 2, cannot free session_callbacks in ldap_int_sasl_open, must

wait until ldap_int_sasl_close because SASL doesn't copy our structure,
it uses it directly.

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 6aa10edfab95dda73727518c358971f589e451c4..89492c6fff8238d807e71720d767ee24c6499771 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -455,8 +455,8 @@ ldap_int_sasl_open(
 #else
        rc = sasl_client_new( "ldap", host, session_callbacks,
                SASL_SECURITY_LAYER, &ctx );
-#endif
        LDAP_FREE( session_callbacks );
+#endif
 
        if ( rc != SASL_OK ) {
                ld->ld_errno = sasl_err2ldap( rc );
@@ -502,6 +502,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;
        }