Import memory leak plugs from HEAD

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 59bf53c96b545ccc98f922fb627033a5f866ac4d..442ffe34f2c29dcf4d9f7a029fa8930d77a37709 100644 (file)
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -418,6 +418,7 @@ ldap_int_sasl_open(
 
        rc = sasl_client_new( "ldap", host, session_callbacks,
                SASL_SECURITY_LAYER, &ctx );
+       ber_memfree( session_callbacks );
 
        if ( rc != SASL_OK ) {
                ld->ld_errno = sasl_err2ldap( rc );

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 950ccc8142065a42e7826d748a9dad724bdb7475..1e3cb78ca0250ad5d07ef21fcb57860c8a28aac7 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -324,6 +324,7 @@ ldap_int_open_connection(
 #ifdef HAVE_CYRUS_SASL
        if( sasl_host != NULL ) {
                ldap_int_sasl_open( ld, conn, sasl_host, sasl_ssf );
+               LDAP_FREE( sasl_host );
        }
 #endif
 

diff --git a/libraries/libldap/unbind.c b/libraries/libldap/unbind.c
index 0699a4be0ba411ce7cd14706086167f232034328..9dd5ea778f53d5995b17378a87d95bf743c1a16b 100644 (file)
--- a/libraries/libldap/unbind.c
+++ b/libraries/libldap/unbind.c
@@ -128,6 +128,26 @@ ldap_ld_free(
                ld->ld_options.ldo_tm_net = NULL;
        }
 
+       if ( ld->ld_options.ldo_def_sasl_mech != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_def_sasl_mech );
+               ld->ld_options.ldo_def_sasl_mech = NULL;
+       }
+
+       if ( ld->ld_options.ldo_def_sasl_realm != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_def_sasl_realm );
+               ld->ld_options.ldo_def_sasl_realm = NULL;
+       }
+
+       if ( ld->ld_options.ldo_def_sasl_authcid != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_def_sasl_authcid );
+               ld->ld_options.ldo_def_sasl_authcid = NULL;
+       }
+
+       if ( ld->ld_options.ldo_def_sasl_authzid != NULL ) {
+               LDAP_FREE( ld->ld_options.ldo_def_sasl_authzid );
+               ld->ld_options.ldo_def_sasl_authzid = NULL;
+       }
+
        ber_sockbuf_free( ld->ld_sb );   
    
        LDAP_FREE( (char *) ld );