From HEAD:

Fix, errno was incorrect after SSL_read returned 0 bytes, caused slapd to
close the connection prematurely.

diff --git a/CHANGES b/CHANGES
index b4d3348c7820e095865a1a095beb705d3c040244..5ae3ff6bffa49f20ee05a919500c3f2460defc79 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,8 @@ OpenLDAP 2.0 Change Log
 OpenLDAP 2.0.22 Engineering
        Fixed slapd passwd modify referral bug
        Fixed back-ldbm ordering presense index bug
-       FIxed back-ldap modify bug (ITS#1547)
+       Fixed back-ldap modify bug (ITS#1547)
+       Fixed -lldap TLS errno bug
        Updated slapd slurpd friendly code
        Build environment
                Fixed Mach cthreads detection (ITS#1554)

diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index f881d91f54f5795c973097d9bfc2f473272d69b9..869d2b1de2aae94ab638ab2b8fe62a6eec65b87a 100644 (file)
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -433,9 +433,7 @@ sb_tls_read( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len)
        err = SSL_get_error( p->ssl, ret );
        if (err == SSL_ERROR_WANT_READ ) {
                sbiod->sbiod_sb->sb_trans_needs_read = 1;
-#ifdef WIN32
                errno = EWOULDBLOCK;
-#endif
        }
        else
                sbiod->sbiod_sb->sb_trans_needs_read = 0;
@@ -461,9 +459,7 @@ sb_tls_write( Sockbuf_IO_Desc *sbiod, void *buf, ber_len_t len)
        err = SSL_get_error( p->ssl, ret );
        if (err == SSL_ERROR_WANT_WRITE ) {
                sbiod->sbiod_sb->sb_trans_needs_write = 1;
-#ifdef WIN32
                errno = EWOULDBLOCK;
-#endif
        }
        else
                sbiod->sbiod_sb->sb_trans_needs_write = 0;