ITS#821: TLS data ready patch

diff --git a/CHANGES b/CHANGES
index 46b7477f534a36b2433a3948ab5d37c95839701a..9cc37b7d42aa9c84fa529c871c6cc1921c6b47f7 100644 (file)
--- 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 3b1000cc98dbe9d5afeb5919b1d70857e60443f4..b82d8835f33e4bc2563249cd646c7e52afa21c4f 100644 (file)
--- 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 );