From: Howard Chu <hyc@openldap.org>
Date: Sun, 22 Jul 2007 17:48:04 +0000 (+0000)
Subject: ITS#5050 use correct (Bind) timeout in dobind_int
X-Git-Tag: OPENLDAP_REL_ENG_2_4_MP~311
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=da9f66ede7eec1162ecfcbebb2767b415f9cef85;p=openldap

ITS#5050 use correct (Bind) timeout in dobind_int
---

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index 8513759bff..8232009fd4 100644
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -1213,6 +1213,7 @@ ldap_back_dobind_int(
 			isbound,
 			binding = 0;
 	ber_int_t	msgid;
+	ber_tag_t	o_tag = op->o_tag;
 
 	assert( lcp != NULL );
 	assert( retries >= 0 );
@@ -1288,6 +1289,7 @@ retry_lock:;
 	 * but the "override" flag is given to idassert.
 	 * It allows to use SASL bind and yet proxyAuthz users
 	 */
+	op->o_tag = LDAP_REQ_BIND;
 	if ( LDAP_BACK_CONN_ISIDASSERT( lc ) ) {
 		if ( BER_BVISEMPTY( &binddn ) && BER_BVISEMPTY( &bindcred ) ) {
 			/* if we got here, it shouldn't return result */
@@ -1415,6 +1417,7 @@ retry:;
 	}
 
 done:;
+	op->o_tag = o_tag;
 	LDAP_BACK_CONN_BINDING_CLEAR( lc );
 	rc = LDAP_BACK_CONN_ISBOUND( lc );
 	if ( !rc ) {