From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 17 Oct 2000 21:41:59 +0000 (+0000)
Subject: ITS#821: TLS data ready patch
X-Git-Tag: OPENLDAP_REL_ENG_2_0_7~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6481a9f105bdb577260f8bbf37628bd817bd64dc;p=thirdparty%2Fopenldap.git

ITS#821: TLS data ready patch
---

diff --git a/CHANGES b/CHANGES
index 46b7477f53..9cc37b7d42 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.0 Change Log
 
 OpenLDAP 2.0.X Engineering
+	Fixed -lldap TLS data ready bug (ITS#821)
 	Fixed slapd spasswd mutex bug
 	Fixed slapd ACL nameuid bug
 	Fixed slapd SASL layerring bug
diff --git a/libraries/libldap/tls.c b/libraries/libldap/tls.c
index 3b1000cc98..b82d8835f3 100644
--- a/libraries/libldap/tls.c
+++ b/libraries/libldap/tls.c
@@ -361,6 +361,11 @@ sb_tls_ctrl( Sockbuf_IO_Desc *sbiod, int opt, void *arg )
 	if ( opt == LBER_SB_OPT_GET_SSL ) {
 		*((SSL **)arg) = p->ssl;
 		return 1;
+
+	} else if ( opt == LBER_SB_OPT_DATA_READY ) {
+		if( SSL_pending( p->ssl ) > 0 ) {
+			return 1;
+		}
 	}
 	
 	return LBER_SBIOD_CTRL_NEXT( sbiod, opt, arg );