Start TLS first op bug fix and plug some leaks

diff --git a/CHANGES b/CHANGES
index 6448699bb8a20de4b5e6f56d6baa2c402cfbb79e..6b1509631eeccf27495985ef17dcae555ba40584 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.0.20 Engineering
        Fixed back-passwd db_config bug
        Fixed -lldap cache debug bug (ITS#1501)
        Fixed -lldap dnssrv free bug
+       Fixed -lldap Start TLS first op bug
        Fixed slurpd TLS non-critical/critical bug (ITS#1527)
        Fixed slurpd SASL password bug (ITS#1528)
        Build environment

diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index 994208ff5ea00a3da7470f9951fa2412b0003d84..f881d91f54f5795c973097d9bfc2f473272d69b9 100644 (file)
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -105,8 +105,35 @@ void
 ldap_pvt_tls_destroy( void )
 {
        SSL_CTX_free(tls_def_ctx);
+       tls_def_ctx = NULL;
+
        EVP_cleanup();
        ERR_free_strings();
+
+       if ( tls_opt_certfile ) {
+               LDAP_FREE( tls_opt_certfile );
+               tls_opt_certfile = NULL;
+       }
+       if ( tls_opt_keyfile ) {
+               LDAP_FREE( tls_opt_keyfile );
+               tls_opt_keyfile = NULL;
+       }
+       if ( tls_opt_cacertfile ) {
+               LDAP_FREE( tls_opt_cacertfile );
+               tls_opt_cacertfile = NULL;
+       }
+       if ( tls_opt_cacertdir ) {
+               LDAP_FREE( tls_opt_cacertdir );
+               tls_opt_cacertdir = NULL;
+       }
+       if ( tls_opt_ciphersuite ) {
+               LDAP_FREE( tls_opt_ciphersuite );
+               tls_opt_ciphersuite = NULL;
+       }
+       if ( tls_opt_randfile ) {
+               LDAP_FREE( tls_opt_randfile );
+               tls_opt_randfile = NULL;
+       }
 }
 
 /*
@@ -968,7 +995,8 @@ ldap_pvt_tls_get_option( LDAP *ld, int option, void *arg )
                *(int *)arg = tls_opt_require_cert;
                break;
        case LDAP_OPT_X_TLS_RANDOM_FILE:
-               *(char **)arg = tls_opt_randfile;
+               *(char **)arg = tls_opt_randfile ?
+                       LDAP_STRDUP( tls_opt_randfile ) : NULL;
                break;
        default:
                return -1;
@@ -1296,7 +1324,7 @@ ldap_start_tls_s ( LDAP *ld,
 
        /* XXYYZ: this initiates operation only on default connection! */
 
-       if ( ldap_pvt_tls_inplace( ld->ld_sb ) != 0 ) {
+       if ( ld->ld_sb != NULL && ldap_pvt_tls_inplace( ld->ld_sb ) != 0 ) {
                return LDAP_LOCAL_ERROR;
        }