Re: (ITS#8957) - openldap-bugs

29 Jan 2019

I Tried to upload it to the openldap ftp server but was not successful so I am trying
the patch again here.

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index bb81d86..20b3dfc 100644
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -489,7 +489,7 @@ ldap_int_open_connection(
 #endif
#ifdef HAVE_TLS
-	if (rc == 0 && ( ld->ld_options.ldo_tls_mode == LDAP_OPT_X_TLS_HARD ||
+	if ((rc == 0 || rc == -2) && ( ld->ld_options.ldo_tls_mode == LDAP_OPT_X_TLS_HARD ||
    	strcmp( srv->lud_scheme, "ldaps" ) == 0 ))
    {
    	++conn->lconn_refcnt;	/* avoid premature free */
Thanks,
Vern
On Tue, January 29, 2019 12:29 pm, Quanah Gibson-Mount wrote:
...
--On Tuesday, January 29, 2019 4:51 PM +0000 vsmith@interlinknetworks.com
wrote:
...
--- openldap-2.4.47/libraries/libldap/open.c?????? 2018-12-19
10:57:06.000000000 -0500
+++ openldap-2.4.47.mod/libraries/libldap/open.c?????? 2019-01-26
18:24:48.000000000 -0500
@@ -440,7 +440,7 @@
??#endif
??#ifdef HAVE_TLS
-?????? if (rc == 0 && ( ld->ld_options.ldo_tls_mode ==
LDAP_OPT_X_TLS_HARD || +?????? if ((rc == 0 || rc == -2) && (
ld->ld_options.ldo_tls_mode ==  LDAP_OPT_X_TLS_HARD || ???????? ?????? strcmp(
srv->lud_scheme, "ldaps" ) == 0 )) ???????? {
???????? ?????? ++conn->lconn_refcnt;?????? /* avoid premature free */
This is not a valid patch.  I don't know if it's your email client that is
destroying the patch?  I suggest uploading it to the FTP site and responding with the
link to the file.
Thanks,
Quanah
--
Quanah Gibson-Mount
Product Architect
Symas Corporation
Packaged, certified, and supported LDAP solutions powered by OpenLDAP:
http://www.symas.com

    