diff -Nru openldap-2.1.30.orig/libraries/libldap/tls.c openldap-2.1.30/libraries/libldap/tls.c

--- openldap-2.1.30.orig/libraries/libldap/tls.c	2003-05-06 16:02:21 +0300

+++ openldap-2.1.30/libraries/libldap/tls.c	2005-06-30 13:19:10 +0300

@@ -1718,7 +1718,8 @@

 	/* XXYYZ: this initiates operation only on default connection! */

-	if ( ld->ld_sb != NULL && ldap_pvt_tls_inplace( ld->ld_sb ) != 0 ) {

+	if (( ld->ld_defconn != NULL ) ? ( ld->ld_defconn->lconn_sb != NULL && ldap_pvt_tls_inplace( ld->ld_defconn->lconn_sb ) != 0 )

+		: ( ld->ld_sb != NULL && ldap_pvt_tls_inplace( ld->ld_sb ) != 0 ) ) {

 		return LDAP_LOCAL_ERROR;

 	}