Happy New Year

[openldap] / servers / slapd / back-meta / bind.c

diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index f8f78bf318d058010e319c9d47163e2b704489b6..f5d4df4e86021cb075fbfda37e63453355357be1 100644 (file)
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2013 The OpenLDAP Foundation.
+ * Copyright 1999-2018 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -618,6 +618,10 @@ meta_back_single_dobind(
 
                /* FIXME: should we check if at least some of the op->o_ctrls
                 * can/should be passed? */
+               if(!dolock) {
+                       ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
+               }
+
                for (;;) {
                        rs->sr_err = ldap_sasl_bind( msc->msc_ld,
                                binddn, LDAP_SASL_SIMPLE, &cred,
@@ -628,6 +632,10 @@ meta_back_single_dobind(
                        ldap_pvt_thread_yield();
                }
 
+               if(!dolock) {
+                       ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
+               }
+
                rs->sr_err = meta_back_bind_op_result( op, rs, mc, candidate, msgid, sendok, dolock );
 
                /* if bind succeeded, but anonymous, clear msc_bound_ndn */
@@ -1578,6 +1586,11 @@ meta_back_proxy_authz_bind(
                switch ( method ) {
                case LDAP_AUTH_NONE:
                case LDAP_AUTH_SIMPLE:
+
+                       if(!dolock) {
+                               ldap_pvt_thread_mutex_unlock( &mi->mi_conninfo.lai_mutex );
+                       }
+
                        for (;;) {
                                rs->sr_err = ldap_sasl_bind( msc->msc_ld,
                                        binddn.bv_val, LDAP_SASL_SIMPLE,
@@ -1587,6 +1600,11 @@ meta_back_proxy_authz_bind(
                                }
                                ldap_pvt_thread_yield();
                        }
+
+                       if(!dolock) {
+                               ldap_pvt_thread_mutex_lock( &mi->mi_conninfo.lai_mutex );
+                       }
+
                        rc = meta_back_bind_op_result( op, rs, mc, candidate, msgid, sendok, dolock );
                        if ( rc == LDAP_SUCCESS ) {
                                /* set rebind stuff in case of successful proxyAuthz bind,