From: Kurt Zeilenga Date: Sat, 26 Jan 2002 20:55:02 +0000 (+0000) Subject: From HEAD: X-Git-Tag: OPENLDAP_REL_ENG_2_0_22~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d099e90d051c9e627b15a64814b4262ab289eef;p=thirdparty%2Fopenldap.git 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 b4d3348c78..5ae3ff6bff 100644 --- 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 f881d91f54..869d2b1de2 100644 --- 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;