Fix mutex deadlock obtaining msgid

diff --git a/libraries/libldap/abandon.c b/libraries/libldap/abandon.c
index 00ad6869e7250a485b25e0c579c5f40a12150a15..24880ab4f9c566e6067a84db1f5a836f944636da 100644 (file)
--- 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,