From: Howard Chu <hyc@openldap.org>
Date: Thu, 23 Dec 2010 23:18:41 +0000 (+0000)
Subject: ITS#6453 cleanup on LDAP_TIMEOUT
X-Git-Tag: MIGRATION_CVS2GIT~333
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1bb648841b0e418ecbcd4314f6f00e15f33692ea;p=openldap

ITS#6453 cleanup on LDAP_TIMEOUT
---

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index 65d55e4774..9bd71bb616 100644
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -182,6 +182,11 @@ ldap_pvt_search_s(
 
 	if( rc <= 0 ) {
 		/* error(-1) or timeout(0) */
+		if ( ld->ld_errno == LDAP_TIMEOUT ) {
+			/* cleanup request */
+			(void) ldap_abandon( ld, msgid );
+			ld->ld_errno = LDAP_TIMEOUT;
+		}
 		return( ld->ld_errno );
 	}