From: David Bender <codehero@yahoo.com>
Date: Wed, 19 Dec 2012 07:34:30 +0000 (-0500)
Subject: ITS#7476 Prevent EINTR from stopping otherwise successful connect
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8f52aa24d3e0737edb1eb6a04e90aa610376cc60;p=openldap

ITS#7476 Prevent EINTR from stopping otherwise successful connect
---

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index c7dc719a7b..b31e05dc9b 100644
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -438,13 +438,21 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s,
 	if ( opt_tv && ldap_pvt_ndelay_on(ld, s) == -1 )
 		return ( -1 );
 
-	if ( connect(s, sin, addrlen) != AC_SOCKET_ERROR ) {
-		if ( opt_tv && ldap_pvt_ndelay_off(ld, s) == -1 )
-			return ( -1 );
-		return ( 0 );
-	}
+	do{
+		osip_debug(ld, "attempting to connect: \n", 0, 0, 0);
+		if ( connect(s, sin, addrlen) != AC_SOCKET_ERROR ) {
+			osip_debug(ld, "connect success\n", 0, 0, 0);
+
+			if ( opt_tv && ldap_pvt_ndelay_off(ld, s) == -1 )
+				return ( -1 );
+			return ( 0 );
+		}
+		err = sock_errno();
+		osip_debug(ld, "connect errno: %d\n", err, 0, 0);
+
+	} while(err == EINTR &&
+		LDAP_BOOL_GET( &ld->ld_options, LDAP_BOOL_RESTART ));
 
-	err = sock_errno();
 	if ( err != EINPROGRESS && err != EWOULDBLOCK ) {
 		return ( -1 );
 	}