From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 8 Sep 2009 07:55:57 +0000 (+0000)
Subject: check for timeout allowed by options (ITS#6282)
X-Git-Tag: ACLCHECK_0~225
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=08b43a89f638128d68fb69d6811f1cdf1d59b7a3;p=openldap

check for timeout allowed by options (ITS#6282)
---

diff --git a/clients/tools/common.c b/clients/tools/common.c
index d0f39b2813..d8fb6ac66f 100644
--- a/clients/tools/common.c
+++ b/clients/tools/common.c
@@ -1438,11 +1438,17 @@ tool_bind( LDAP *ld )
 			}
 		}
 
-		if ( ldap_result( ld, msgid, LDAP_MSG_ALL, NULL, &result ) == -1 ) {
+		rc = ldap_result( ld, msgid, LDAP_MSG_ALL, NULL, &result );
+		if ( rc == -1 ) {
 			tool_perror( "ldap_result", -1, NULL, NULL, NULL, NULL );
 			exit( LDAP_LOCAL_ERROR );
 		}
 
+		if ( rc == 0 ) {
+			tool_perror( "ldap_result", LDAP_TIMEOUT, NULL, NULL, NULL, NULL );
+			exit( LDAP_LOCAL_ERROR );
+		}
+
 		rc = ldap_parse_result( ld, result, &err, &matched, &info, &refs,
 			&ctrls, 1 );
 		if ( rc != LDAP_SUCCESS ) {