ITS#6603

diff --git a/CHANGES b/CHANGES
index f793a460d2117a990f54c7974d4a34a5cff6e730..cca78276427a1e998bb8ca8265238efabdb20b47 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ OpenLDAP 2.4.24 Engineering
        Fixed libldap GnuTLS hang on socket close (ITS#6673)
        Fixed libldap sasl partial write handling (ITS#6639)
        Fixed libldap referral chasing (ITS#6602)
+       Fixed libldap unnecessary ifdef's (ITS#6603)
        Fixed libldap url parsing with NULL host (ITS#6653)
        Fixed liblutil getpass prompts (ITS#6702)
        Fixed ldapsearch segfault with deref (ITS#6638)

diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index f494e91238723a8e9a18187f4434b3318f5c4ffa..d84c1907cd0bcfbce49bbd62c3158419f5914cc4 100644 (file)
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -549,11 +549,7 @@ ber_get_next(
                                }
                                /* Did we run out of bytes? */
                                if ((char *)p == ber->ber_rwptr) {
-#if defined( EWOULDBLOCK )
                                        sock_errset(EWOULDBLOCK);
-#elif defined( EAGAIN )
-                                       sock_errset(EAGAIN);
-#endif                 
                                        return LBER_DEFAULT;
                                }
                        }
@@ -562,11 +558,7 @@ ber_get_next(
                }
 
                if ( ber->ber_ptr == ber->ber_rwptr ) {
-#if defined( EWOULDBLOCK )
                        sock_errset(EWOULDBLOCK);
-#elif defined( EAGAIN )
-                       sock_errset(EAGAIN);
-#endif                 
                        return LBER_DEFAULT;
                }
 
@@ -581,11 +573,7 @@ ber_get_next(
                        }
                        /* Not enough bytes? */
                        if (ber->ber_rwptr - (char *)p < llen) {
-#if defined( EWOULDBLOCK )
                                sock_errset(EWOULDBLOCK);
-#elif defined( EAGAIN )
-                               sock_errset(EAGAIN);
-#endif                 
                                return LBER_DEFAULT;
                        }
                        for (i=0; i<llen; i++) {
@@ -672,11 +660,7 @@ ber_get_next(
                ber->ber_rwptr+=res;
                
                if (res<to_go) {
-#if defined( EWOULDBLOCK )
                        sock_errset(EWOULDBLOCK);
-#elif defined( EAGAIN )
-                       sock_errset(EAGAIN);
-#endif                 
                        return LBER_DEFAULT;
                }
 done:

diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index 29c0b6f55e9e8afcb4c1eeecc3caa718dad1b11e..ec62ff5cf174d618de6faeef1e1fe637bb08618b 100644 (file)
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -503,12 +503,8 @@ nextresp3:
                Debug( LDAP_DEBUG_CONNS,
                        "ber_get_next failed.\n", 0, 0, 0 );
 #endif            
-#ifdef EWOULDBLOCK                     
                if ( err == EWOULDBLOCK ) return LDAP_MSG_X_KEEP_LOOKING;
-#endif
-#ifdef EAGAIN
                if ( err == EAGAIN ) return LDAP_MSG_X_KEEP_LOOKING;
-#endif
                ld->ld_errno = LDAP_SERVER_DOWN;
                --lc->lconn_refcnt;
                lc->lconn_status = 0;