From: Howard Chu <hyc@openldap.org>
Date: Fri, 13 Feb 2004 02:47:53 +0000 (+0000)
Subject: Fix mutex deadlock obtaining msgid
X-Git-Tag: OPENLDAP_REL_ENG_2_2_BP~427
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=75af144930b56f1605a0be4d24a4a3c007d82edd;p=openldap

Fix mutex deadlock obtaining msgid
---

diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c
index 00ad6869e7..24880ab4f9 100644
--- a/libraries/libldap/abandon.c
+++ b/libraries/libldap/abandon.c
@@ -186,7 +186,12 @@ do_abandon(
 			ld->ld_errno = LDAP_NO_MEMORY;
 
 		} else {
-			LDAP_NEXT_MSGID(ld, i);
+	/*
+	 * We already have the mutex in LDAP_R_COMPILE, so
+	 * don't try to get it again.
+	 *		LDAP_NEXT_MSGID(ld, i);
+	 */
+			i = ++(ld)->ld_msgid;
 #ifdef LDAP_CONNECTIONLESS
 			if ( LDAP_IS_UDP(ld) ) {
 			    err = ber_write( ber, ld->ld_options.ldo_peer,