From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 3 Jan 2011 23:50:06 +0000 (+0000)
Subject: ITS#6603
X-Git-Tag: OPENLDAP_REL_ENG_2_4_24~181
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1594417e58601d5ad936c218b153813212dcf32e;p=openldap

ITS#6603
---

diff --git a/CHANGES b/CHANGES
index f793a460d2..cca7827642 100644
--- 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 f494e91238..d84c1907cd 100644
--- 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 29c0b6f55e..ec62ff5cf1 100644
--- 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;